OpencachingDeutschland/oc-server3
1
0
Fork 0
Code Issues Pull Requests Releases Activity

merge stable

Browse Source
This commit is contained in:
following
2013-03-16 16:20:52 +01:00
parent 7b091a41fd 35e85dd47e
commit 8157494aca
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/lib2/RSSParser.class.php
View File

@ -25,6 +25,7 @@ class RSSParser {
// output // output
$html = '<div class="buffer" style="width: 500px;height: 2px;">&nbsp;</div>'."\n"; $html = '<div class="buffer" style="width: 500px;height: 2px;">&nbsp;</div>'."\n";
$html .= '<div class="newsblock">';
// get xml-data // get xml-data
$data = file_get_contents($url); $data = file_get_contents($url);
@ -50,10 +51,10 @@ class RSSParser {
} else { } else {
// add html // add html
$html .= '<p class="content-title-noshade-size2" style="display: inline;">'."\n"; $html .= '<p class="content-title-noshade-size15" style="display: inline;">'."\n";
$html .= strftime('%e. %B %Y',strtotime($item->pubDate)).' - '. $item->title; $html .= strftime('%e. %B %Y',strtotime($item->pubDate)).' - '. $item->title;
$html .= '</p> <p style="line-height: 1.6em;display: inline;">&emsp;[<b><a class="link" href="'.$item->link.'">mehr...</a></b>]</p>'."\n"; $html .= '</p> <p style="line-height: 1.6em;display: inline;">&emsp;[<b><a class="link" href="'.$item->link.'">mehr...</a></b>]</p>'."\n";
$html .= '<p>'.$item->description.'</p>'."\n"; $html .= '<div class="rsstext">'.$item->description.'</div>'."\n";
} }
// increment counter // increment counter
@ -61,6 +62,7 @@ class RSSParser {
} }
// finish html // finish html
$html .= "</div>";
$html .= '<div class="buffer" style="width: 500px;">&nbsp;</div>'."\n"; $html .= '<div class="buffer" style="width: 500px;">&nbsp;</div>'."\n";
} }
catch(Exception $e) { catch(Exception $e) {

9
htdocs/resource2/ocstyle/css/style_screen.css
View File

@ -256,6 +256,7 @@ ul#statmenu { padding: 0px; margin: 0px;}
.content-title-noshade-size0 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 70%;} .content-title-noshade-size0 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 70%;}
.content-title-noshade-size05 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 80%;} .content-title-noshade-size05 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 80%;}
.content-title-noshade-size1 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 130%;} .content-title-noshade-size1 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 130%;}
.content-title-noshade-size15 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 136%;}
.content-title-noshade-size2 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 150%;} .content-title-noshade-size2 {margin: 0px; padding: 0px; color: rgb(88,144,168); font-weight: bold; font-size: 150%;}
.content-title-noshade-size3 { .content-title-noshade-size3 {
margin: 0px; margin: 0px;
@ -1373,3 +1374,11 @@ div#havefound {
.adminrestore { .adminrestore {
color: #819ac1; color: #819ac1;
} }
/* RSS feeds */
#blog div.newsblock { margin-left:12px }
#forum div.newsblock { margin-left:12px }
#blog div.rsstext {margin: 0px 30px 0.5em 0; padding: 0px; line-height: 1.3em; font-family: arial, sans serif; font-size: 12px; }
.quoteheader, .topslice_quote, .bbc_standard_quote { display:none; }
#forum div.rsstext {margin: 0px 30px 0.5em 28px; padding: 0px; line-height: 1.3em; font-family: arial, sans serif; font-size: 12px; }
.quoteheader, .topslice_quote, .bbc_standard_quote { display:none; }

8
htdocs/templates2/ocstyle/start.tpl
View File

@ -34,7 +34,9 @@
{/foreach} {/foreach}
</table> </table>
{else} {else}
{$news} <div id="blog">
{$news}
</div>
{/if} {/if}
{* next events *} {* next events *}
@ -119,7 +121,9 @@
<div class="buffer" style="width: 500px;">&nbsp;</div> <div class="buffer" style="width: 500px;">&nbsp;</div>
</div> </div>
*} *}
{$forum} <div id="forum">
{$forum}
</div>
{* {*
<ul class="nodot"> <ul class="nodot">
{foreach from=$phpbb_topics item=phpbbItem} {foreach from=$phpbb_topics item=phpbbItem}