|
From: Benjamin C. <bc...@us...> - 2004-09-04 20:46:12
|
Update of /cvsroot/phpbt/phpbt/templates/default In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18900/templates/default Modified Files: Tag: htmltemplates wrap.html Log Message: Fixes for undefined variables. Dynamic CHARSET. Index: wrap.html =================================================================== RCS file: /cvsroot/phpbt/phpbt/templates/default/wrap.html,v retrieving revision 1.28.4.3 retrieving revision 1.28.4.4 diff -u -r1.28.4.3 -r1.28.4.4 --- wrap.html 2 May 2004 17:06:35 -0000 1.28.4.3 +++ wrap.html 4 Sep 2004 20:46:03 -0000 1.28.4.4 @@ -1,57 +1,57 @@ <html> <head> - <META HTTP-EQUIV="Expires" CONTENT="-1"> - <title>phpBugTracker - <?php echo $page_title ?></title> - <link rel="StyleSheet" href="styles/<?php echo STYLE ?>.css" type="text/css" /> + <META HTTP-EQUIV="Expires" CONTENT="-1"> + <title>phpBugTracker - <?php echo $page_title ?></title> + <link rel="StyleSheet" href="styles/<?php echo STYLE ?>.css" type="text/css" /> <link rel="stylesheet" type="text/css" href="styles/print.css" media="print" /> - <META http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> + <?php if (defined('CHARSET')) echo '<META http-equiv="Content-Type" content="text/html; charset='.CHARSET.'">'; ?> </head> <body> <div class="nav"> - <div class="header_image"> - <img name="title" src="<?php echo $template_path ?>/images/title.gif" width="500" height="50" border="0" alt="" hspace="0" vspace="0"> - </div> - <div class="header_search"> - <form action="bug.php"> - <input type="hidden" name="op" value="show"> - <?php echo translate("Find Bug") ?> - <input name="bugid" type="text" id="bugid" size="4"> - - </form> - </div> - <ul id="tabnav"> - <li><a href="index.php" style="border: none;"><?php echo translate("Home"); ?></a></li> - <li><a href="bug.php?op=add"><?php echo translate("Add a new bug"); ?></a></li> - <li><a href="query.php?op=query"><?php echo translate("Query Bugs"); ?></a></li> - <li><a href="report.php"><?php echo translate("View Reports"); ?></a></li> - <?php if (!NEW_ACCOUNTS_DISABLED && empty($_SESSION['uid'])) { ?><li><a href="newaccount.php"><?php echo translate("Create a New Account"); ?></a></li><?php } ?> - <li><a href="docs/html/userguide.html"><?php echo translate("Read Documentation"); ?></a></li> - <?php if (isset($perm) && $perm->have_perm('Administrator')) { ?><li><a href="admin/project.php"><?php echo translate("Administration Tools"); ?></a></li><?php } ?> - </ul> + <div class="header_image"> + <img name="title" src="<?php echo $template_path ?>/images/title.gif" width="500" height="50" border="0" alt="" hspace="0" vspace="0"> + </div> + <div class="header_search"> + <form action="bug.php"> + <input type="hidden" name="op" value="show"> + <?php echo translate("Find Bug") ?> + <input name="bugid" type="text" id="bugid" size="4"> + + </form> + </div> + <ul id="tabnav"> + <li><a href="index.php" style="border: none;"><?php echo translate("Home"); ?></a></li> + <li><a href="bug.php?op=add"><?php echo translate("Add a new bug"); ?></a></li> + <li><a href="query.php?op=query"><?php echo translate("Query Bugs"); ?></a></li> + <li><a href="report.php"><?php echo translate("View Reports"); ?></a></li> + <?php if (!NEW_ACCOUNTS_DISABLED && empty($_SESSION['uid'])) { ?><li><a href="newaccount.php"><?php echo translate("Create a New Account"); ?></a></li><?php } ?> + <li><a href="docs/html/userguide.html"><?php echo translate("Read Documentation"); ?></a></li> + <?php if (isset($perm) && $perm->have_perm('Administrator')) { ?><li><a href="admin/project.php"><?php echo translate("Administration Tools"); ?></a></li><?php } ?> + </ul> </div> <?php if (basename($_SERVER['SCRIPT_NAME']) != 'newaccount.php') { ?> <div class="personalarea"> <form method="post" action="<?php echo $_SERVER['SCRIPT_NAME'].($_SERVER['REQUEST_STRING'] ? '?'.$_SERVER['REQUEST_STRING'] : '') ?>"> -<?php if (!$_SESSION['uid']) { ?> - <?php if (EMAIL_IS_LOGIN) $loginlabel = translate("Email"); - else $loginlabel = translate("Login"); - ?> - <?php echo $loginerror ?> - <?php echo $loginlabel ?>: <input type="text" name="username" class="bottomnavinput" value="<?php echo $_COOKIE['phpbt_user'] ?>"> - <?php echo translate("Password") ?>: <input type="password" name="password" class="bottomnavinput"> - <input type="hidden" name="dologin" value="1"> - <input type="submit" value="<?php echo translate("Login"); ?>" class="bottomnavinput"> - <input type="submit" name="sendpass" value="<?php echo translate("Email Password"); ?>" class="bottomnavinput" title="<?php echo translate("Forgot your password? Have it sent to you") ?>"> - <?php if (RECALL_LOGIN) { ?> - <input type="checkbox" name="savecookie" value="1" <?php if (!empty($_COOKIE['phpbt_user'])) echo 'checked' ?> class="bottomnavinput" title="<?php printf(translate('Remember %s for next time'), $loginlabel) ?>"> <?php echo translate("Remember me"); ?> - <?php } ?> +<?php if (empty($_SESSION['uid'])) { ?> + <?php if (EMAIL_IS_LOGIN) $loginlabel = translate("Email"); + else $loginlabel = translate("Login"); + ?> + <?php echo !empty($loginerror) ? $loginerror : ''; ?> + <?php echo $loginlabel ?>: <input type="text" name="username" class="bottomnavinput" value="<?php echo $_COOKIE['phpbt_user'] ?>"> + <?php echo translate("Password") ?>: <input type="password" name="password" class="bottomnavinput"> + <input type="hidden" name="dologin" value="1"> + <input type="submit" value="<?php echo translate("Login"); ?>" class="bottomnavinput"> + <input type="submit" name="sendpass" value="<?php echo translate("Email Password"); ?>" class="bottomnavinput" title="<?php echo translate("Forgot your password? Have it sent to you") ?>"> + <?php if (RECALL_LOGIN) { ?> + <input type="checkbox" name="savecookie" value="1" <?php if (!empty($_COOKIE['phpbt_user'])) echo 'checked' ?> class="bottomnavinput" title="<?php printf(translate('Remember %s for next time'), $loginlabel) ?>"> <?php echo translate("Remember me"); ?> + <?php } ?> <?php } else { ?> - <?php echo translate("Bugs assigned to me"); ?>: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open"><?php echo $owner_open ?></a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed"><?php echo $owner_closed ?></a> - | <?php echo translate("Bugs reported by me"); ?>: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open"><?php echo $reporter_open ?></a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed"><?php echo $reporter_closed ?></a> - | <a href="user.php"><?php echo translate("Personal Page"); ?></a> - | <a href="logout.php"><?php echo printf(translate('Logout %s'), $_SESSION['uname']); ?></a> + <?php echo translate("Bugs assigned to me"); ?>: <a href="query.php?op=mybugs&assignedto=1&open=1" title="Open"><?php echo $owner_open ?></a> / <a href="query.php?op=mybugs&assignedto=1&open=0" title="Closed"><?php echo $owner_closed ?></a> + | <?php echo translate("Bugs reported by me"); ?>: <a href="query.php?op=mybugs&reportedby=1&open=1" title="Open"><?php echo $reporter_open ?></a> / <a href="query.php?op=mybugs&reportedby=1&open=0" title="Closed"><?php echo $reporter_closed ?></a> + | <a href="user.php"><?php echo translate("Personal Page"); ?></a> + | <a href="logout.php"><?php echo translate("Logout"); ?></a> <?php } ?> </form> @@ -59,7 +59,7 @@ <?php } ?> <div style="padding: 5px;"> - <?php include($content_template) ?> + <?php include($content_template) ?> </div> </body> |