spacing tidy up

This commit is contained in:
dhawes 2005-08-11 12:45:38 +00:00
parent a4221c1d20
commit fd9576fb1b
6 changed files with 51 additions and 46 deletions

View file

@ -236,7 +236,6 @@ class block_rss_client extends block_base {
$returnstring .= '<div class="link"><a href="'. $item['link'] .'" target="_blank">'. $item['title'] . '</a></div>' ."\n"; $returnstring .= '<div class="link"><a href="'. $item['link'] .'" target="_blank">'. $item['title'] . '</a></div>' ."\n";
if ($display_description && !empty($item['description'])) { if ($display_description && !empty($item['description'])) {
$item['description'] = break_up_long_words($item['description'], 30); $item['description'] = break_up_long_words($item['description'], 30);
$returnstring .= '<div class="description">'. $returnstring .= '<div class="description">'.

View file

@ -1,14 +1,14 @@
<?php //$Id$ <?php //$Id$
// Print an error page condition
require_once('../../config.php');
require_once('../../config.php'); $error = required_param('error', PARAM_CLEAN);
$error = required_param('error',PARAM_CLEAN); print_header(get_string('error'),
print_header(get_string('error'),
get_string('error'), get_string('error'),
get_string('error') ); get_string('error') );
print clean_text(urldecode($error)); print clean_text(urldecode($error));
print_footer(); print_footer();
?> ?>

View file

@ -17,6 +17,7 @@
<?php print_string('clientnumentries', 'block_rss_client') ?> <?php print_string('clientnumentries', 'block_rss_client') ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right">block_rss_timeout:</td> <td align="right">block_rss_timeout:</td>
<td> <td>
@ -31,6 +32,7 @@
<?php print_string('timeout', 'block_rss_client') ?> <?php print_string('timeout', 'block_rss_client') ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right">block_rss_client_submitters:</td> <td align="right">block_rss_client_submitters:</td>
<td> <td>
@ -56,13 +58,11 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="3" align="center"> <td colspan="3" align="center">
<input type="submit" value="<?php print_string('savechanges') ?>"></td> <input type="submit" value="<?php print_string('savechanges') ?>"></td>
</tr> </tr>
<tr> <tr>
<td colspan="3" align="center"><a href=" <?php echo $CFG->wwwroot; ?>/blocks/rss_client/block_rss_client_action.php?id=<?php <td colspan="3" align="center"><a href=" <?php echo $CFG->wwwroot; ?>/blocks/rss_client/block_rss_client_action.php?id=<?php
if (!isset($id)) { if (!isset($id)) {
$id = ''; $id = '';

View file

@ -1,4 +1,4 @@
<?php <?php // $Id$ //
require_once($CFG->libdir .'/rsslib.php'); require_once($CFG->libdir .'/rsslib.php');
$id = optional_param('id', SITEID, PARAM_INT); $id = optional_param('id', SITEID, PARAM_INT);
@ -7,7 +7,7 @@ $id = optional_param('id', SITEID, PARAM_INT);
$page = page_create_object($this->instance->pagetype, $this->instance->pageid); $page = page_create_object($this->instance->pagetype, $this->instance->pageid);
/// Print tabs at top /// Print tabs at top
$currentaction = optional_param( 'currentaction','',PARAM_ALPHA ); $currentaction = optional_param('currentaction', '', PARAM_ALPHA);
if (empty($currentaction) || $currentaction == 'configblock') { if (empty($currentaction) || $currentaction == 'configblock') {
$currentaction = 'configblock'; $currentaction = 'configblock';
} else { } else {
@ -38,6 +38,7 @@ if ($currentaction == 'configblock') {
?> ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right" width="50%"> <td align="right" width="50%">
<?php print_string('shownumentrieslabel', 'block_rss_client') ?> <?php print_string('shownumentrieslabel', 'block_rss_client') ?>
@ -56,6 +57,7 @@ if ($currentaction == 'configblock') {
?>" /> ?>" />
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right" width="50%"> <td align="right" width="50%">
<?php print_string('choosefeedlabel', 'block_rss_client') ?> <?php print_string('choosefeedlabel', 'block_rss_client') ?>
@ -95,6 +97,7 @@ if ($currentaction == 'configblock') {
?> ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right" width="50%"><?php print_string('uploadlabel'); ?></td> <td align="right" width="50%"><?php print_string('uploadlabel'); ?></td>
<?php <?php
@ -106,6 +109,7 @@ if ($currentaction == 'configblock') {
<td width="50%"><input type="text" name="title" size="30" value="<?php echo $title; ?>" /> <td width="50%"><input type="text" name="title" size="30" value="<?php echo $title; ?>" />
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right" width="50%"><?php print_string('clientshowchannellinklabel', 'block_rss_client'); ?></td> <td align="right" width="50%"><?php print_string('clientshowchannellinklabel', 'block_rss_client'); ?></td>
<td width="50%"> <td width="50%">
@ -122,6 +126,7 @@ if ($currentaction == 'configblock') {
?> ?>
</td> </td>
</tr> </tr>
<tr valign="top"> <tr valign="top">
<td align="right" width="50%"><?php print_string('clientshowimagelabel', 'block_rss_client'); ?></td> <td align="right" width="50%"><?php print_string('clientshowimagelabel', 'block_rss_client'); ?></td>
<td width="50%"> <td width="50%">
@ -138,6 +143,7 @@ if ($currentaction == 'configblock') {
?> ?>
</td> </td>
</tr> </tr>
<tr> <tr>
<td colspan="2" align="center"> <td colspan="2" align="center">
<input type="submit" value="<?php print_string('savechanges') ?>"> <input type="submit" value="<?php print_string('savechanges') ?>">

View file

@ -2,21 +2,21 @@
/// This file to be included so we can assume config.php has already been included. /// This file to be included so we can assume config.php has already been included.
/// We also assume that $inactive, $activetab and $currentaction have been set /// We also assume that $inactive, $activetab and $currentaction have been set
global $USER; global $USER;
$tabs = $row = array(); $tabs = $row = array();
$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id)); $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'configblock', 'id' => $id));
$row[] = new tabobject('configblock', $script, $row[] = new tabobject('configblock', $script,
get_string('configblock', 'block_rss_client')); get_string('configblock', 'block_rss_client'));
$script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id)); $script = $page->url_get_full(array('instanceid' => $this->instance->id, 'sesskey' => $USER->sesskey, 'blockaction' => 'config', 'currentaction' => 'managefeeds', 'id' => $id));
$row[] = new tabobject('managefeeds', $script, $row[] = new tabobject('managefeeds', $script,
get_string('managefeeds', 'block_rss_client')); get_string('managefeeds', 'block_rss_client'));
$tabs[] = $row; $tabs[] = $row;
/// Print out the tabs and continue! /// Print out the tabs and continue!
print '<div align="center">'; print '<div align="center">';
print_tabs($tabs, $currentaction); print_tabs($tabs, $currentaction);
print '</div>'; print '</div>';
?> ?>