Menu
▾
▴
[Openautomation-svn] SF.net SVN: openautomation:[655] CometVisu/trunk/visu
|
From: <j-...@us...> - 2012-01-15 17:36:12
|
Revision: 655
http://openautomation.svn.sourceforge.net/openautomation/?rev=655&view=rev
Author: j-n-k
Date: 2012-01-15 17:36:05 +0000 (Sun, 15 Jan 2012)
Log Message:
-----------
Fix css/ design issues for rss-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/plugins/rss/structure_plugin.js
Modified: CometVisu/trunk/visu/designs/alaska/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska/basic.css 2012-01-15 17:09:04 UTC (rev 654)
+++ CometVisu/trunk/visu/designs/alaska/basic.css 2012-01-15 17:36:05 UTC (rev 655)
@@ -385,6 +385,10 @@
text-decoration: none;
}
+.rss_inline>ul {
+ padding-left:1em;
+ margin: 0px;
+}
/* styles for the preview */
div#demo_1, div#demo_2, div#demo_3 {
Modified: CometVisu/trunk/visu/designs/alaska_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-01-15 17:09:04 UTC (rev 654)
+++ CometVisu/trunk/visu/designs/alaska_slim/basic.css 2012-01-15 17:36:05 UTC (rev 655)
@@ -330,6 +330,11 @@
cursor: pointer;
}
+.rss_inline>ul {
+ padding-left:1em;
+ margin: 0px;
+}
+
.diagram_inline
{
width: 320px;
Modified: CometVisu/trunk/visu/designs/discreet/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet/basic.css 2012-01-15 17:09:04 UTC (rev 654)
+++ CometVisu/trunk/visu/designs/discreet/basic.css 2012-01-15 17:36:05 UTC (rev 655)
@@ -389,6 +389,11 @@
opacity: 0.80;
}
+.rss_inline>ul {
+ padding-left:1em;
+ margin: 0px;
+}
+
/* styles for the preview */
div#demo_1, div#demo_2 {
width: 100%;
Modified: CometVisu/trunk/visu/designs/discreet_sand/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-01-15 17:09:04 UTC (rev 654)
+++ CometVisu/trunk/visu/designs/discreet_sand/basic.css 2012-01-15 17:36:05 UTC (rev 655)
@@ -169,6 +169,8 @@
{
color: #165d7e; /*#3F2F1F;*/
width: 49%;
+ line-height: 2em;
+ padding-left: 1em;
}
.page
@@ -373,6 +375,10 @@
color: #453420;
}
+.rss_inline>ul {
+ padding-left:1em;
+ margin: 0px;
+}
#diagramTooltip {
z-index: 1000;
color: black;
Modified: CometVisu/trunk/visu/designs/discreet_slim/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-01-15 17:09:04 UTC (rev 654)
+++ CometVisu/trunk/visu/designs/discreet_slim/basic.css 2012-01-15 17:36:05 UTC (rev 655)
@@ -336,7 +336,6 @@
display: none !important;
}
-
.popup,
.popup_background {
position: absolute;
@@ -369,6 +368,11 @@
border-bottom: 1px solid;
}
+.rss_inline>ul {
+ padding-left:1em;
+ margin: 0px;
+}
+
.popup_background.error {
background: #800000;
border: #f00;
Modified: CometVisu/trunk/visu/designs/pure/basic.css
===================================================================
--- CometVisu/trunk/visu/designs/pure/basic.css 2012-01-15 17:09:04 UTC (rev 654)
+++ CometVisu/trunk/visu/designs/pure/basic.css 2012-01-15 17:36:05 UTC (rev 655)
@@ -371,6 +371,11 @@
opacity: 0.80;
}
+.rss_inline>ul {
+ padding-left:1em;
+ margin: 0px;
+}
+
/*****************************************************************************/
/* The definition of the flavours - overwrite the generic settings */
/*****************************************************************************/
Modified: CometVisu/trunk/visu/plugins/rss/structure_plugin.js
===================================================================
--- CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2012-01-15 17:09:04 UTC (rev 654)
+++ CometVisu/trunk/visu/plugins/rss/structure_plugin.js 2012-01-15 17:36:05 UTC (rev 655)
@@ -42,7 +42,7 @@
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 + "\"></div></div>");
+ var actor = $("<div class=\"actor\"><div class=\"rss_inline\" id=\"" + id + "\"><div class='ul'></div></div></div>");
var rss = $("#" + id, actor);
if ($p.attr("width")) {
@@ -103,32 +103,32 @@
if (src.match(/^http/)) {
//use zrssfeed
jQuery(function() {
- $(rss).rssfeed(src, {
- limit: rss.data("limit"),
- header: eval(rss.data("header")),
- date: eval(rss.data("date")),
- content: rss.data("content"),
- snippet: eval(rss.data("snippet")),
- showerror: eval(rss.data("showerror")),
- ssl: eval(rss.data("ssl")),
- linktarget: rss.data("linktarget"),
- });
+ $(rss).rssfeed(src, {
+ limit: rss.data("limit"),
+ header: eval(rss.data("header")),
+ date: eval(rss.data("date")),
+ content: rss.data("content"),
+ snippet: eval(rss.data("snippet")),
+ showerror: eval(rss.data("showerror")),
+ ssl: eval(rss.data("ssl")),
+ linktarget: rss.data("linktarget"),
+ });
});
} else {
jQuery(function() {
- $(rss).rssfeedlocal({
- src: src,
- limit: rss.data("limit"),
- header: eval(rss.data("header")),
- date: eval(rss.data("date")),
- content: rss.data("content"),
- snippet: eval(rss.data("snippet")),
- showerror: eval(rss.data("showerror")),
- ssl: eval(rss.data("ssl")),
- linktarget: rss.data("linktarget"),
- link: eval(rss.data("link")),
- title: eval(rss.data("title"))
- });
+ $(rss).rssfeedlocal({
+ src: src,
+ limit: rss.data("limit"),
+ header: eval(rss.data("header")),
+ date: eval(rss.data("date")),
+ content: rss.data("content"),
+ snippet: eval(rss.data("snippet")),
+ showerror: eval(rss.data("showerror")),
+ ssl: eval(rss.data("ssl")),
+ linktarget: rss.data("linktarget"),
+ link: eval(rss.data("link")),
+ title: eval(rss.data("title"))
+ });
});
}
if (typeof (refresh) != "undefined" && refresh) {
@@ -177,6 +177,7 @@
},
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">' +
@@ -185,9 +186,10 @@
+'" target="' + o.linktarget + '">'
+ jQuery(feed).find('title:first').text()
+'</a>' + '</div></p>');
-*/
- jQuery(feed).find('item').each(function(i){
- var row = 'odd';
+*/
+ var row = 'odd';
+ jQuery(feed).find('item').each(function(i) {
+
var itemHtml;
if (o.link)
itemHtml = o.html.replace(/{title}/, '<a href="'
@@ -201,7 +203,7 @@
itemHtml = o.html.replace(/{title}/, '');
itemHtml = itemHtml.replace(/{text}/, jQuery(this).find('description').text());
- var entryDate = new Date(jQuery(this).find('pubDate').text());
+ var entryDate = new Date($(this).find('pubDate').text());
if (o.date && entryDate)
itemHtml = itemHtml.replace(/{date}/, entryDate.toLocaleDateString() + ' ' + entryDate.toLocaleTimeString() + ' ');
else
@@ -209,17 +211,18 @@
jQuery(c).append(jQuery('<' + o.wrapper + ' class="rssRow ' + row + '">').append(itemHtml));
- // Alternate row classes
- if (row == 'odd') {
- row = 'even';
- } else {
- row = 'odd';
- }
+ // Alternate row classes
+ if (row == 'odd') {
+ row = 'even';
+ } else {
+ row = 'odd';
+ }
if (i == o.limit-1) {
return false;
}
- });
+ });
+ $('li').wrapAll("<ul>");
}
});
});
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
