mirror of
https://github.com/pfsense/pfsense.git
synced 2025-10-26 11:38:35 +00:00
Merge pull request #458 from ExolonDX/branch_28
Tidy up "picture" and "rss" widget XHTML
This commit is contained in:
commit
e0977d20f4
@ -69,26 +69,27 @@ if($_POST) {
|
||||
|
||||
?>
|
||||
|
||||
<input type="hidden" id="picture-config" name="picture-config" value="">
|
||||
<input type="hidden" id="picture-config" name="picture-config" value="" />
|
||||
|
||||
<div id="picture-settings" name="picture-settings" class="widgetconfigdiv" style="display:none;">
|
||||
</form>
|
||||
<div id="picture-settings" class="widgetconfigdiv" style="display:none;">
|
||||
<form action="/widgets/widgets/picture.widget.php" method="post" name="iforma" enctype="multipart/form-data">
|
||||
<input name="pictfile" type="file" class="formfld unknown" id="pictfile" size="20"></p>
|
||||
<input name="pictfile" type="file" class="formfld unknown" id="pictfile" size="20" />
|
||||
<input id="submita" name="submita" type="submit" class="formbtn" value="Upload" /><br/>
|
||||
<b>NOTE:</b> Best image size is 350x350 or smaller.
|
||||
</form>
|
||||
</div>
|
||||
|
||||
<div id="picture-widgets" style="padding: 5px">
|
||||
<a href='/widgets/widgets/picture.widget.php?getpic=true' target='_new'>
|
||||
<img border=0 width="350" height="350" src="/widgets/widgets/picture.widget.php?getpic=true">
|
||||
<a href='/widgets/widgets/picture.widget.php?getpic=true' target='_blank'>
|
||||
<img border="0" width="350" height="350" src="/widgets/widgets/picture.widget.php?getpic=true" alt="picture" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<!-- needed to show the settings widget icon -->
|
||||
<script language="javascript" type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
selectIntLink = "picture-configure";
|
||||
textlink = document.getElementById(selectIntLink);
|
||||
textlink.style.display = "inline";
|
||||
//]]>
|
||||
</script>
|
||||
|
||||
@ -76,14 +76,13 @@ else
|
||||
|
||||
?>
|
||||
|
||||
<input type="hidden" id="rss-config" name="rss-config" value="">
|
||||
<input type="hidden" id="rss-config" name="rss-config" value="" />
|
||||
|
||||
<div id="rss-settings" name="rss-settings" class="widgetconfigdiv" style="display:none;">
|
||||
</form>
|
||||
<form action="/widgets/widgets/rss.widget.php" method="post" name="iforma">
|
||||
<textarea name=rssfeed class="formfld unknown" id="rssfeed" cols="40" rows="3"><?=$textarea_txt;?></textarea>
|
||||
<div id="rss-settings" class="widgetconfigdiv" style="display:none;">
|
||||
<form action="/widgets/widgets/rss.widget.php" method="post" name="iformc">
|
||||
<textarea name="rssfeed" class="formfld unknown" id="rssfeed" cols="40" rows="3"><?=$textarea_txt;?></textarea>
|
||||
<br/>
|
||||
<table>
|
||||
<table summary="rss widget">
|
||||
<tr>
|
||||
<td align="right">
|
||||
Display number of items:
|
||||
@ -131,7 +130,7 @@ else
|
||||
|
||||
</td>
|
||||
<td>
|
||||
<input id="submita" name="submita" type="submit" class="formbtn" value="Save" />
|
||||
<input id="submitc" name="submitc" type="submit" class="formbtn" value="Save" />
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -162,11 +161,11 @@ else
|
||||
foreach($feed->get_items() as $item) {
|
||||
$feed = $item->get_feed();
|
||||
$feed->strip_htmltags();
|
||||
echo "<a target='_new' href='" . $item->get_permalink() . "'>" . $item->get_title() . "</a><br/>";
|
||||
echo "<a target='blank' href='" . $item->get_permalink() . "'>" . $item->get_title() . "</a><br/>";
|
||||
$content = $item->get_content();
|
||||
$content = strip_tags($content);
|
||||
echo textLimit($content, $rsswidgettextlength) . "<br/>";
|
||||
echo "Source: <a target='_new' href='" . $item->get_permalink() . "'><img src='" . $feed->get_favicon() . "' alt='" . $feed->get_title() . "' title='" . $feed->get_title() . "' border='0' width='16' height='16'></a><br/>";
|
||||
echo "Source: <a target='_blank' href='" . $item->get_permalink() . "'><img src='" . $feed->get_favicon() . "' alt='" . $feed->get_title() . "' title='" . $feed->get_title() . "' border='0' width='16' height='16' /></a><br/>";
|
||||
$counter++;
|
||||
if($counter > $max_items)
|
||||
break;
|
||||
@ -176,8 +175,10 @@ else
|
||||
</div>
|
||||
|
||||
<!-- needed to display the widget settings menu -->
|
||||
<script language="javascript" type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
//<![CDATA[
|
||||
selectIntLink = "rss-configure";
|
||||
textlink = document.getElementById(selectIntLink);
|
||||
textlink.style.display = "inline";
|
||||
//]]>
|
||||
</script>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user