Index: blocks/rss_client/block_rss_client.php
===================================================================
--- blocks/rss_client/block_rss_client.php (revision 1276)
+++ blocks/rss_client/block_rss_client.php (working copy)
@@ -173,11 +173,11 @@
}
if($showtitle){
- $r.='
'.$feedtitle.'
';
+ $r.=''.$feedtitle.'
';
}
- $r.=''."\n";
+ $r.=''."\n";
$feeditems = $feed->get_items(0, $maxentries);
foreach($feeditems as $item){
@@ -215,7 +215,7 @@
* @return string html li representing the rss feed item
*/
function get_item_html($item){
-
+ global $OUTPUT;
$link = $item->get_link();
$title = $item->get_title();
$description = $item->get_description();
@@ -236,23 +236,27 @@
//This can by done using htmlspecialchars_decode() but moodle_url also has that effect
$link = new moodle_url($link);
}
+ $linkcontent = $OUTPUT->pix_icon('i/navigationitem', $title, 'moodle', array('class'=>'smallicon navicon')) . s($title);
+ $r = html_writer::start_tag('li', array('class'=>'item_with_icon'));
+ $r.= html_writer::start_tag('div', array('class'=>'tree_item'));
+
+ $r .= html_writer::start_tag('div',array('class'=>'link'));
+ $r.= html_writer::link(clean_param($link,PARAM_URL),$linkcontent, array('title'=>$title, 'onclick'=>'this.target="_blank"'));
+ $r.= html_writer::end_tag('div');
+
+ if($this->config->display_description && !empty($description)){
+
+ $description = break_up_long_words($description, 30);
- $r = html_writer::start_tag('li');
- $r.= html_writer::start_tag('div',array('class'=>'link'));
- $r.= html_writer::link(clean_param($link,PARAM_URL), s($title), array('onclick'=>'this.target="_blank"'));
- $r.= html_writer::end_tag('div');
+ $formatoptions = new stdClass();
+ $formatoptions->para = false;
- if($this->config->display_description && !empty($description)){
-
- $description = break_up_long_words($description, 30);
-
- $formatoptions = new stdClass();
- $formatoptions->para = false;
-
- $r.= html_writer::start_tag('div',array('class'=>'description'));
- $r.= format_text($description, FORMAT_HTML, $formatoptions, $this->page->course->id);
- $r.= html_writer::end_tag('div');
- }
+ $r.= html_writer::start_tag('div',array('class'=>'description'));
+ $r.= format_text($description, FORMAT_HTML, $formatoptions, $this->page->course->id);
+ $r.= html_writer::end_tag('div');
+
+ }
+ $r.= html_writer::end_tag('div');
$r.= html_writer::end_tag('li');
return $r;
Index: blocks/rss_client/styles.css
===================================================================
--- blocks/rss_client/styles.css (revision 0)
+++ blocks/rss_client/styles.css (working copy)
@@ -0,0 +1,41 @@
+/** General display rules **/
+.block.block_rss_client .title {
+ padding:0;
+}
+
+.block_rss_client .title h3 {
+ font-size:0.95em;
+ margin-top:0.2em;
+}
+
+.block_rss_client .block_tree li.item_with_icon > .tree_item {
+ position: relative;
+}
+.block_rss_client .block_tree li.item_with_icon > .tree_item img {
+ left: 0;
+ position: absolute;
+ top: 3px;
+ vertical-align: middle;
+}
+.block_rss_client .block_tree li.item_with_icon > .tree_item .link a {
+ vertical-align:top;
+ line-height:1.2em;
+}
+
+.block_rss_client .block_tree .tree_item {
+ margin: 3px 0;
+ padding:0 0 4px 18px;
+ text-align: left;
+}
+
+.block_rss_client .block_tree .tree_item .description {
+ padding-bottom:14px;
+}
+
+.block_rss_client .image img{
+ border: 1px solid #E2E2E2;
+ max-width:100%;
+}
+.block_rss_client ul+div.image {
+ margin-top:12px;
+}
\ No newline at end of file
Index: theme/standard/style/blocks.css
===================================================================
--- theme/standard/style/blocks.css (revision 1276)
+++ theme/standard/style/blocks.css (working copy)
@@ -80,9 +80,9 @@
/** RSS Client **/
.block_rss_client .image {text-align:center;}
-.block_rss_client .list li {padding:5px;font-size:0.85em;border-top:1px solid #DDD;}
+.block_rss_client .list li {font-size:0.85em;border-top:1px solid #DDD;}
.block_rss_client .list li:first-child {border-top-width: 0px;}
-.block_rss_client .list li .description {color:#555555;font-size:0.8em;padding-left:1em;}
+.block_rss_client .list li .description {color:#555555;font-size:0.8em;}
/** Site main menu **/
.block_site_main_menu .footer select {font-size: 0.8em;}
\ No newline at end of file