cvs: php-master-web / style.css /images php.gif /include functions.inc
| From: | Hannes Magnusson | Date: | Fri, 24 Apr 2009 07:00:30 +0000 |
| Subject: | cvs: php-master-web / style.css /images php.gif /include functions.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-4522@lists.php.net to get a copy of this message | ||
bjori Fri Apr 24 07:00:30 2009 UTC
Added files:
/php-master-web/images php.gif
Modified files:
/php-master-web style.css
/php-master-web/include functions.inc
Log:
- Prettify the header
- Remove the inventory link (its in the wiki now) and added bugsweb+wiki
- Show file+line in sql failures (for debugging)
http://cvs.php.net/viewvc.cgi/php-master-web/style.css?r1=1.22&r2=1.23&diff_format=u
Index: php-master-web/style.css
diff -u php-master-web/style.css:1.22 php-master-web/style.css:1.23
--- php-master-web/style.css:1.22 Sat Jun 12 16:00:39 2004
+++ php-master-web/style.css Fri Apr 24 07:00:30 2009
@@ -15,11 +15,6 @@
font-size: smaller;
font-family: sans-serif;
}
-p.warning, .error {
- background: #ffeeee;
- border: 1px solid #ff0000;
- padding: 2px 4px;
-}
/* Notes management page */
@@ -96,3 +91,81 @@
color: #DD0000;
background-color: transparent;
}
+
+
+
+
+
+body {
+ margin: 0;
+ font-family: Tahoma, Arial, sans-serif, serif, monospace;
+ background-color: #f8f8f8;
+}
+h1#header {
+ margin: 0;
+ background: url(/images/php.gif) #5a5993 no-repeat;
+ padding: 20px 0 10px 150px;
+ height: 37px;
+ font-style: italic;
+ font-size: 1em;
+ color: #B5B5E9;
+}
+h1#header a {
+ color: #B5B5E9;
+}
+ul#mainmenu {
+ margin: 0;
+ background-color: #f3f3f3;
+ font-size: 0.9em;
+ padding: 8px 10px;
+ text-align: center;
+ border-top: 1px solid #000000;
+ border-bottom: 1px solid #D0D0D0;
+}
+ul#mainmenu li {
+ display: inline;
+ padding: 0 1%;
+ border-right: 1px solid #CDCDCD;
+}
+ul#mainmenu li a {
+ color: #6181B7;
+}
+ul#mainmenu li:last-child {
+ border: 0px;
+}
+p.warning, p.warning {
+ padding: 1em;
+ margin: 0px;
+ border-bottom:1px solid #D0D0D0;
+ margin-bottom: 6px;
+ text-align: center;
+ font-weight: bold;
+ font-size:1.17em;
+}
+p.warning {
+ background:#ffffff;
+ color:#6F0000;
+}
+p.error {
+ background: #FFEEEE;
+ border: 1px solid #666600;
+ color: #660000;
+}
+
+div#profile {
+ margin: 10px 100px 0 100px;
+}
+h2 {
+ margin: 0;
+ font-size: 1em;
+}
+div.note {
+ text-indent: 30px;
+ margin: 5px;
+ padding: 5px 0 0 0;
+ border-bottom:1px solid #D0D0D0;
+ width: 600px;
+}
+div.note:last-child {
+ border-bottom: 0;
+}
http://cvs.php.net/viewvc.cgi/php-master-web/include/functions.inc?r1=1.16&r2=1.17&diff_format=u
Index: php-master-web/include/functions.inc
diff -u php-master-web/include/functions.inc:1.16 php-master-web/include/functions.inc:1.17
--- php-master-web/include/functions.inc:1.16 Tue Apr 7 20:03:00 2009
+++ php-master-web/include/functions.inc Fri Apr 24 07:00:30 2009
@@ -1,5 +1,5 @@
<?php
-// $Id: functions.inc,v 1.16 2009/04/07 20:03:00 philip Exp $
+// $Id: functions.inc,v 1.17 2009/04/24 07:00:30 bjori Exp $
// -----------------------------------------------------------------------------------
@@ -18,25 +18,22 @@
?>
<html>
<head>
- <title><?php echo $title;?></title>
- <link rel="stylesheet" type="text/css" href="/style.css" />
- <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
+ <title>PHP: <?php echo $title ?></title>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <link type="text/css" media="all" rel="stylesheet"
href="/style.css" />
+ <link rel="shortcut icon" href="http://php.net/favicon.ico" />
</head>
+
<body>
- <div id="header">
- <div id="logo">
- <a href="http://www.php.net/">
- <img src="/include/logo.gif" width="53" height="28"
border="0" alt="php" align="absmiddle" />
- </a>
- </div>
- <div id="links">
- <a href="/manage/event.php">events</a> •
- <a href="/inventory.php">inventory</a> •
- <a href="/manage/mirrors.php">mirrors</a> •
- <a href="/manage/users.php">users</a> •
- <a href="/manage/user-notes.php">notes</a>
- </div>
- </div>
+ <h1 id="header"><a href="http://php.net/index.php">PHP: Hypertext
Preprocessor</a> - <?php echo $title ?></h1>
+ <ul id="mainmenu">
+ <li><a href="/manage/event.php">Events</a></li>
+ <li><a href="/manage/mirrors.php">Mirrors</a></li>
+ <li><a href="/manage/users.php">Users</a></li>
+ <li><a href="/manage/user-notes.php">Notes</a></li>
+ <li><a href="http://wiki.php.net/">Wiki</a></li>
+ <li><a href="http://bugs.php.net/">Bugsweb</a></li>
+ </ul>
<?php
}
@@ -74,9 +71,11 @@
function db_query($query)
{
+ //var_dump($query);
$res = @mysql_query($query);
if (!$res) {
- die(format_warn("Query failed: " . hsc(mysql_error()) . "<tt>\n"
. hsc($query) . "</tt>"));
+ $bt = debug_backtrace();
+ die(format_warn("Query failed: " . hsc(mysql_error()) . "<tt>\n"
. hsc($query) . "</tt><br
/>({$bt[0]['file']}:{$bt[0]['line']})"));
}
return $res;
}