Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[665] CometVisu/trunk/visu
|
From: <j-...@us...> - 2012-01-23 17:59:52
|
Revision: 665
http://openautomation.svn.sourceforge.net/openautomation/?rev=665&view=rev
Author: j-n-k
Date: 2012-01-23 17:59:41 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
Added support for colspan, usage: colspan="x" in widget-defintion
Each design has to implement all possible multi-columncolspan-classes:
single-column-designs: none
two-column-designs: colspan2
three-column-designs: colspan2, colspan3
etc.
Basic support: currently only in rsslog-plugin
Modified Paths:
--------------
CometVisu/trunk/visu/designs/alaska/basic.css
CometVisu/trunk/visu/designs/alaska_slim/basic.css
CometVisu/trunk/visu/designs/discreet/basic.css
CometVisu/trunk/visu/designs/discreet_sand/basic.css
CometVisu/trunk/visu/designs/discreet_slim/basic.css
CometVisu/trunk/visu/designs/pure/basic.css
CometVisu/trunk/visu/lib/templateengine.js
CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/designs/alaska/basic.css 2012-01-23 17:59:41 UTC (rev 665)
@@ -92,6 +92,10 @@
float: left;
}
+.colspan2 {
+ width:100%;
+}
+
.widget_container .widget_container {
width: 100%;
}
Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-01-23 17:59:41 UTC (rev 665)
@@ -87,6 +87,14 @@
float: left;
}
+.colspan2 {
+ width:66%;
+}
+
+.colspan3 {
+ width:99%;
+}
+
.widget_container .widget_container {
width: 100%;
}
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2012-01-23 17:59:41 UTC (rev 665)
@@ -86,6 +86,10 @@
float: left;
}
+.colspan2 {
+ width:100%;
+}
+
.widget_container .widget_container {
width: 100%;
}
Modified: CometVisu/trunk/visu/designs/discreet_sand/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-01-23 17:59:41 UTC (rev 665)
@@ -79,6 +79,10 @@
float: left;
}
+.colspan2 {
+ width:100%;
+}
+
.widget_container .widget_container {
width: 100%;
}
Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-01-23 17:59:41 UTC (rev 665)
@@ -79,6 +79,14 @@
float: left;
}
+.colspan2 {
+ width:66%;
+}
+
+.colspan3 {
+ width:99%;
+}
+
.widget_container .widget_container {
width: 100%;
}
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2012-01-23 17:59:41 UTC (rev 665)
@@ -67,6 +67,10 @@
float: left;
}
+.colspan2 {
+ width:100%;
+}
+
.widget_container .widget_container {
width: 100%;
}
Modified: CometVisu/trunk/visu/lib/templateengine.js
===================================================================
--- CometVisu/trunk/visu/lib/templateengine.js 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/lib/templateengine.js 2012-01-23 17:59:41 UTC (rev 665)
@@ -173,12 +173,16 @@
$(elem).remove();
}
- $('head').append('<style>.rowspan' + rowspan + ' { height: ' + totalHeight + 'px; } </style>');
+ $('head').append('<style>.rowspan' + rowspan + ' { height: ' + totalHeight + 'px; overflow:hidden;} </style>');
}
return className;
}
+function colspanClass(colspan, elem) {
+ var className = 'colspan'+ colspan; // mostly dummy, has to be defined in design-CSS
+ return className;
+}
function parseXML(xml) {
// erst mal den Cache für AJAX-Requests wieder aktivieren
$.ajaxSetup({cache: true});
@@ -384,7 +388,7 @@
.data("textContent", page.textContent);
if (jQuery(retval).is(".widget")) {
- retval = jQuery("<div class='widget_container' />").append(retval);
+ retval = jQuery("<div class='widget_container "+retval.data("colspanClass")+"' />").append(retval);
}
return retval;
Modified: CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2012-01-21 17:23:16 UTC (rev 664)
+++ CometVisu/trunk/visu/plugins/rsslog/structure_plugin.js 2012-01-23 17:59:41 UTC (rev 665)
@@ -48,6 +48,9 @@
ret_val.addClass(rowspanClass($p.attr("rowspan")));
}
+ if ($p.attr("colspan")) { // add colspan only if not default
+ ret_val.data("colspanClass", colspanClass($p.attr("colspan")));
+ }
var labelElement = $p.find('label')[0];
var label = labelElement ? '<div class="label">' + labelElement.textContent + '</div>' : '';
@@ -152,15 +155,6 @@
success: function(feed){
jQuery(c).html('');
-/* FIXME: Header gets added on each refresh, unsupported in rssfeedlocal for now..
- if (options.header)
- jQuery(c).parent().parent().prepend( '<p><div class="rssHeader">' +
- '<a href="' + jQuery(feed).find('link:first').text()
- +'" title="'+ jQuery(feed).find('description:first').text()
- +'" target="' + o.linktarget + '">'
- + jQuery(feed).find('title:first').text()
- +'</a>' + '</div></p>');
-*/
// get height of one entry, calc max num of display items in widget
var dummyDiv = $('<' + o.wrapper + ' class="rssRow odd" id="dummydiv">').append('<li />').appendTo($(c));
var itemheight = dummyDiv.height();
@@ -203,7 +197,7 @@
var entryDate = new Date($(item).find('pubDate').text());
if (entryDate) {
itemHtml = (o.timeformat) ?
- (itemHtml.replace(/{date}/, entryDate.toLocaleFormat(o.timeformat) + ' ')) :
+ (itemHtml.replace(/{date}/, entryDate.strftime(o.timeformat) + ' ')) :
(itemHtml.replace(/{date}/, entryDate.toLocaleDateString() + ' ' + entryDate.toLocaleTimeString() + ' '));
} else {
itemHtml = itemHtml.replace(/{date}/, '');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
