[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] CVS: wiki/template common.php,1.5,1.6 edit.php,1.3,1.
From: |
Ralf Becker <address@hidden> |
Subject: |
[Phpgroupware-cvs] CVS: wiki/template common.php,1.5,1.6 edit.php,1.3,1.4 find.php,1.4,1.5 preview.php,1.4,1.5 view.php,1.3,1.4 |
Date: |
Wed, 19 Mar 2003 19:46:18 -0500 |
Update of /cvsroot/phpgroupware/wiki/template
In directory subversions:/tmp/cvs-serv31657/template
Modified Files:
common.php edit.php find.php preview.php view.php
Log Message:
some cosmetics for a better look
Index: common.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/common.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** common.php 4 Mar 2003 22:17:11 -0000 1.5
--- common.php 20 Mar 2003 00:46:15 -0000 1.6
***************
*** 23,27 ****
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
! global $StyleScript, $SeparateTitleWords, $SeparateHeaderWords;
$keywords = ' ' . html_split_name($args['headlink']);
--- 23,27 ----
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
! global $StyleScript, $SeparateTitleWords, $SeparateHeaderWords, $SearchURL;
$keywords = ' ' . html_split_name($args['headlink']);
***************
*** 80,87 ****
</h1>
<?php
! if($args['toolbar'])
! { print html_toolbar_top(); }
! ?>
! <!--<hr align=left width=99% /> -->
</div>
<?php
--- 80,104 ----
</h1>
<?php
! if($args['toolbar'])
! {
! if(!$args['nosearch'])
! {
! echo "<form method='get' action='$FindScript'
name='thesearch'>
! <input type='hidden' name='action'
value='find'/>
! <div class='form'>\n";
! }
! print html_toolbar_top();
!
! if(!$args['nosearch'])
! {
! echo ' | Search: <input type="text" name="find"
size="20" />';
! }
! echo "\n<hr align=left width=99% />\n";
!
! if(!$args['nosearch']) {
! echo "</div>\n</form>\n";
! }
! }
! ?>
</div>
<?php
***************
*** 116,124 ****
<hr align=left width=99% />
<?php
! if(!$args['nosearch'])
! {
! ?>
! <form method="get" action="<?php print $FindScript; ?>" name="thesearch">
! <div class="form">
<?php
}
--- 133,140 ----
<hr align=left width=99% />
<?php
! if(!$args['nosearch']) { ?>
! <form method="get" action="<?php print $FindScript; ?>" name="thesearch">
! <div class="form">
! <input type="hidden" name="action" value="find" />
<?php
}
***************
*** 148,155 ****
?>
<a href="<?php print historyURL($args['history']); ?>">View document
history</a>
! <input type="hidden" name="action" value="find" />
! <? if(!$args['nosearch']) { ?>
! | Search: <input type="text" name="find" size="20" />
! <? }
echo "<br />";
}
--- 164,176 ----
?>
<a href="<?php print historyURL($args['history']); ?>">View document
history</a>
! <?php
! echo ' | <a href="' . $PrefsScript . '">Preferences</a>' .
! ($GLOBALS['phpgw_info']['user']['apps']['admin'] ?
! ' | <a href="'.$AdminScript.'">Administration</a>' : '');
!
! if(!$args['nosearch']) { ?>
! | Search: <input type="text" name="find" size="20" />
! <?php
! }
echo "<br />";
}
***************
*** 159,163 ****
Document last modified <?php print html_time($args['timestamp']); ?><br />
<?php
! }
if($args['twin'] != '')
{
--- 180,187 ----
Document last modified <?php print html_time($args['timestamp']); ?><br />
<?php
! } ?>
! </div>
! </form>
! <?php
if($args['twin'] != '')
{
***************
*** 172,180 ****
if(!$args['nosearch'] && $args['history'])
{
! ?>
! <hr align=left width=99% />
! </div>
! </form>
! <?php
}
?>
--- 196,200 ----
if(!$args['nosearch'] && $args['history'])
{
! echo "\n<hr align=left width=99% />\n";
}
?>
Index: edit.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/edit.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** edit.php 3 Mar 2003 14:16:25 -0000 1.3
--- edit.php 20 Mar 2003 00:46:15 -0000 1.4
***************
*** 23,34 ****
'headlink' => $args['page'],
'headsufx' => '',
! 'toolbar' => 1));
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => '',
! 'editver' => '',
! 'history' => $args['page'],
! 'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
!
?>
<div id="body">
--- 23,28 ----
'headlink' => $args['page'],
'headsufx' => '',
! 'toolbar' => 1,
! 'nosearch' => 0));
?>
<div id="body">
***************
*** 65,75 ****
</div>
<?php
! /* template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => '',
'history' => $args['page'],
'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
! */
}
?>
--- 59,68 ----
</div>
<?php
! template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => '',
'history' => $args['page'],
'timestamp' => $args['timestamp'],
! 'nosearch' => 1));
}
?>
Index: find.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/find.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** find.php 4 Mar 2003 22:17:11 -0000 1.4
--- find.php 20 Mar 2003 00:46:15 -0000 1.5
***************
*** 20,24 ****
'toolbar' => 1));
?>
- <hr align="left" width="99%">
<div id="body">
<?php print $args['pages']; ?>
--- 20,23 ----
Index: preview.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/preview.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** preview.php 4 Mar 2003 22:56:10 -0000 1.4
--- preview.php 20 Mar 2003 00:46:15 -0000 1.5
***************
*** 26,35 ****
'headlink' => $args['page'],
'headsufx' => '',
! 'toolbar' => 1));
! template_common_epilogue(array('twin' => $args['page'],
! 'edit' => '',
! 'editver' => 0,
! 'history' => $args['page'],
! 'timestamp' => $args['timestamp'],
'nosearch' => 0));
?>
--- 26,30 ----
'headlink' => $args['page'],
'headsufx' => '',
! 'toolbar' => 1,
'nosearch' => 0));
?>
***************
*** 76,86 ****
</div>
<?php
! /* template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => 0,
'history' => $args['page'],
'timestamp' => $args['timestamp'],
! 'nosearch' => 0));
! */
}
?>
--- 71,80 ----
</div>
<?php
! template_common_epilogue(array('twin' => $args['page'],
'edit' => '',
'editver' => 0,
'history' => $args['page'],
'timestamp' => $args['timestamp'],
! 'nosearch' => 1));
}
?>
Index: view.php
===================================================================
RCS file: /cvsroot/phpgroupware/wiki/template/view.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** view.php 3 Mar 2003 14:16:25 -0000 1.3
--- view.php 20 Mar 2003 00:46:15 -0000 1.4
***************
*** 25,28 ****
--- 25,29 ----
: '',
'toolbar' => 1));
+ /*
template_common_epilogue(array('twin' => $args['page'],
'edit' => $args['page'],
***************
*** 33,37 ****
'timestamp' => $args['timestamp'],
'nosearch' => 0));
!
?>
<div id="body">
--- 34,38 ----
'timestamp' => $args['timestamp'],
'nosearch' => 0));
! */
?>
<div id="body">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] CVS: wiki/template common.php,1.5,1.6 edit.php,1.3,1.4 find.php,1.4,1.5 preview.php,1.4,1.5 view.php,1.3,1.4,
Ralf Becker <address@hidden> <=