|
From: <tom...@us...> - 2003-08-20 16:29:14
|
Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29925
Modified Files:
serendipity_config_local.tpl
serendipity_admin_installer.inc.php
Log Message:
Allow for discriptions of each configuration category.
If someone has better descriptions, please commit.
Index: serendipity_config_local.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config_local.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_config_local.tpl 15 Aug 2003 23:04:36 -0000 1.15
+++ serendipity_config_local.tpl 20 Aug 2003 15:59:06 -0000 1.16
@@ -1,6 +1,7 @@
<?php # $Id$
// Database Settings
+# Here you can enter all your database information. Serendipity needs this to be able to function
$serendipity['dbType'] = '{Database type|dbType|string|mysql}'; // Database type (mysql|postgres)
$serendipity['dbHost'] = '{Database host|dbHost|string|localhost}'; // MySQL host
$serendipity['dbUser'] = '{Database user|dbUser|string|serendipity}'; // Username
@@ -8,7 +9,8 @@
$serendipity['dbName'] = '{Database name|dbName|string|serendipity}'; // Name of your database
$serendipity['dbPrefix'] = '{Database prefix|dbPrefix|string|serendipity_}'; // Prefix for the table names, i.e. serendipity_
-// Paths (note: don't forget trailing slashes for directories!!!!)
+// Paths
+# Various paths to diffirent essential folders and files. Don't forget trailing slashes for directories!
$serendipity['serendipityPath'] = '{Full path|serendipityPath|string|/webroot/serendipity/}'; // The full and aboslute path to your serendipity installation.
$serendipity['uploadPath'] = '{Upload path|uploadPath|string|uploads/}'; // All uploads will go here, relative to the 'Full path' - typically 'uploads/'
$serendipity['serendipityHTTPPath'] = '{Relative path|serendipityHTTPPath|string|/serendipity/}'; // Path to serendipity for your browser, typically '/serendipity/'
@@ -18,6 +20,7 @@
$serendipity['indexFile'] = '{Index file|indexFile|string|index.php}'; // Which file to use as index
// General settings
+# Customize how Serendipity behaves
$serendipity['user'] = '{Admin username|user|string|John Doe}'; // Username for admin login
$serendipity['pass'] = '{Admin password|pass|protected|john}'; // Password for admin login
$serendipity['email'] = '{Admin email|email|string|jo...@ex...}'; // Email for admin login
@@ -29,6 +32,7 @@
$serendipity['lang'] = '{Language file|lang|string|en}'; // Language (for 'en' you need serendipity_lang_en.inc.php).
// Appearance and options
+# Customize how Serendipity looks and feels
$serendipity['extCSS'] = '{External Stylesheet|extCSS|string|none}'; // You can define a stylesheet uri here, aditionally to the settings adjustable in the admin interface (enter 'none' if you don't need this)
$serendipity['wysiwyg'] = '{Use WYSIWYG editor|wysiwyg|bool|0}'; // Do you want to use the WYSIWYG editor (CAUTION: only turn this on if you use Microsoft's Internet Explorer!!!)?
$serendipity['XHTML11'] = '{Force XHTML 1.1 compliance|XHTML11|bool|0}'; // Do you want to force XHTML 1.1 compliance (may cause problems for back-/frontend on older 4th generation browsers)
@@ -37,9 +41,10 @@
$serendipity['blockReferer'] = '{Blocked Referers|blockReferer|string|;}'; // Are there any special hosts you want not to show up in the referers list? Separate the list of hostnames with ';' and note that the host is blocked by substring matches!
// Imageconversion Settings
+# Enter general information about how serendipity should handle Images
$serendipity['magick'] = '{Use Imagemagick|magick|bool|0}'; // Do you have image magick installed
$serendipity['convert'] = '{Path to convert binary|convert|string|/usr/local/bin/convert}'; // Full path & name of your image magick convert binary
$serendipity['thumbSuffix'] = '{Thumbnail suffix|thumbSuffix|string|serendipityThumb}'; // Thumbnails will be named original.Suffix.ext
-$serendipity['thumbSize'] = '{Thumbnail dimensions|thumbSize|int|110}'; // Dimensions of auto-generated thumbnails
+$serendipity['thumbSize'] = '{Thumbnail dimensions|thumbSize|int|110}'; // Static width of auto-generated thumbnails
?>
Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- serendipity_admin_installer.inc.php 20 Aug 2003 15:34:40 -0000 1.30
+++ serendipity_admin_installer.inc.php 20 Aug 2003 15:59:06 -0000 1.31
@@ -60,17 +60,19 @@
case '/':
if ($l[1] == '/') {
$current = trim(substr($l, 2));
- $config[$current] = array();
- }
+ $config['categories'][$current] = array();
+ }
break;
-
+ case '#':
+ $config['descriptions'][$current] = trim(substr($l, 1));
+ break;
// A configure option
case '$':
// Grep out the name, type and default
preg_match('#\{([^|]+\|[^|]+\|([^}]+)?)\}[^/]+/{2}(.+)#msi', $l, $match);
$c = explode('|', $match[1]);
- $config[$current][] = array(
+ $config['categories'][$current][] = array(
'longname' => $c[0],
'name' => $c[1],
'type' => $c[2],
@@ -151,7 +153,7 @@
</div>
<?php
$el_count = 0;
- foreach ($t as $key => $value) {
+ foreach ($t['categories'] as $key => $value) {
$el_count++;
?>
<table width="100%" cellspacing="2">
@@ -163,6 +165,13 @@
<tr>
<td>
<table width="100%" cellspacing="0" cellpadding="3" style="display: none;" id="el<?php echo $el_count; ?>">
+ <tr>
+ <td style="padding-left: 20px; font-size: 10pt" colspan="2">
+ <?php echo $t['descriptions'][$key] ?>
+ </td>
+ </tr>
+
+
<?php
for ($x=0; $x<count($value); $x++) {
if (@is_array($from)) {
@@ -174,11 +183,11 @@
<strong><span style="font-size: 9pt"><?php echo $value[$x]['longname']; ?></span></strong>
<br />
<span style="color: #5E7A94; font-size: 8pt;"><?php echo '(' . $value[$x]['type'] . ') ' . $value[$x]['desc']; ?></span>
- </th>
+ </td>
<td style="border-bottom: 1px #000000 solid; font-size: 8pt" align="left" valign="middle" width="1">
<?php echo serendipity_guessInput($value[$x]['type'], $value[$x]['name'], $from[$value[$x]['name']], $value[$x]['default']); ?>
- </th>
+ </td>
</tr>
<?php
}
|
