[geeklog-cvs] Geeklog-1.x/public_html/admin/install help.php, 1.3, 1.4 index.php, 1.37, 1.38
Dirk Haun
dhaun at qs1489.pair.com
Thu May 1 05:52:58 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv85242
Modified Files:
help.php index.php
Log Message:
Added missing help links; moved InnoDB note to the help screen; cosmetics
Index: help.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/help.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** help.php 29 Mar 2008 22:17:47 -0000 1.3
--- help.php 1 May 2008 09:52:56 -0000 1.4
***************
*** 9,13 ****
// | Support for Geeklog installation script. |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2007 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
--- 9,13 ----
// | Support for Geeklog installation script. |
// +---------------------------------------------------------------------------+
! // | Copyright (C) 2000-2008 by the following authors: |
// | |
// | Authors: Tony Bibbs - tony AT tonybibbs DOT com |
***************
*** 87,124 ****
<h1 class="heading">' . $LANG_HELP[0] . '</h1>
<h2><a name="site_name">' . $LANG_INSTALL[32] . '</a></h2>
! <p>' . $LANG_HELP[1] . '</p>
<h2><a name="site_slogan">' . $LANG_INSTALL[33] . '</a></h2>
! <p>' . $LANG_HELP[2] . '</p>
<h2><a name="db_type">' . $LANG_INSTALL[34] . '</a></h2>
! <p>' . $LANG_HELP[3] . '</p>
<h2><a name="db_host">' . $LANG_INSTALL[39] . '</a></h2>
! <p>' . $LANG_HELP[4] . '</p>
<h2><a name="db_name">' . $LANG_INSTALL[40] . '</a></h2>
! <p>' . $LANG_HELP[5] . '</p>
<h2><a name="db_user">' . $LANG_INSTALL[41] . '</a></h2>
! <p>' . $LANG_HELP[6] . '</p>
<h2><a name="db_pass">' . $LANG_INSTALL[42] . '</a></h2>
! <p>' . $LANG_HELP[7] . '</p>
<h2><a name="db_prefix">' . $LANG_INSTALL[43] . '</a></h2>
! <p>' . $LANG_HELP[8] . '</p>
<h2><a name="site_url">' . $LANG_INSTALL[45] . '</a></h2>
! <p>' . $LANG_HELP[9] . '</p>
<h2><a name="site_admin_url">' . $LANG_INSTALL[47] . '</a></h2>
! <p>' . $LANG_HELP[10] . '</p>
<h2><a name="site_mail">' . $LANG_INSTALL[48] . '</a></h2>
! <p>' . $LANG_HELP[11] . '</p>
<h2><a name="noreply_mail">' . $LANG_INSTALL[49] . '</a></h2>
! <p>' . $LANG_HELP[12] . '</p>
</div>
--- 87,127 ----
<h1 class="heading">' . $LANG_HELP[0] . '</h1>
<h2><a name="site_name">' . $LANG_INSTALL[32] . '</a></h2>
! <p class="indent">' . $LANG_HELP[1] . '</p>
<h2><a name="site_slogan">' . $LANG_INSTALL[33] . '</a></h2>
! <p class="indent">' . $LANG_HELP[2] . '</p>
<h2><a name="db_type">' . $LANG_INSTALL[34] . '</a></h2>
! <p class="indent">' . $LANG_HELP[3] . '</p>
<h2><a name="db_host">' . $LANG_INSTALL[39] . '</a></h2>
! <p class="indent">' . $LANG_HELP[4] . '</p>
<h2><a name="db_name">' . $LANG_INSTALL[40] . '</a></h2>
! <p class="indent">' . $LANG_HELP[5] . '</p>
<h2><a name="db_user">' . $LANG_INSTALL[41] . '</a></h2>
! <p class="indent">' . $LANG_HELP[6] . '</p>
<h2><a name="db_pass">' . $LANG_INSTALL[42] . '</a></h2>
! <p class="indent">' . $LANG_HELP[7] . '</p>
<h2><a name="db_prefix">' . $LANG_INSTALL[43] . '</a></h2>
! <p class="indent">' . $LANG_HELP[8] . '</p>
<h2><a name="site_url">' . $LANG_INSTALL[45] . '</a></h2>
! <p class="indent">' . $LANG_HELP[9] . '</p>
<h2><a name="site_admin_url">' . $LANG_INSTALL[47] . '</a></h2>
! <p class="indent">' . $LANG_HELP[10] . '</p>
<h2><a name="site_mail">' . $LANG_INSTALL[48] . '</a></h2>
! <p class="indent">' . $LANG_HELP[11] . '</p>
<h2><a name="noreply_mail">' . $LANG_INSTALL[49] . '</a></h2>
! <p class="indent">' . $LANG_HELP[12] . '</p>
!
! <h2><a name="utf8">' . $LANG_INSTALL[92] . '</a></h2>
! <p class="indent">' . $LANG_HELP[13] . '</p>
</div>
***************
*** 130,132 ****
echo $display;
! ?>
\ No newline at end of file
--- 133,135 ----
echo $display;
! ?>
Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** index.php 1 May 2008 08:46:22 -0000 1.37
--- index.php 1 May 2008 09:52:56 -0000 1.38
***************
*** 196,220 ****
<p><label>' . $LANG_INSTALL[32] . ' ' . INST_helpLink('site_name') . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="40"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[33] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="40"' . XHTML . '></p><br' . XHTML . '>
! <p><label>' . $LANG_INSTALL[34] . ' ' . INST_helpLink('') . '</label> <select name="db_type">
<option value="mysql"' . $mysql_selected . '>' . $LANG_INSTALL[35] . '</option>
' . ($install_type == 'install' ? '<option value="mysql-innodb"' . $mysql_innodb_selected . '>' . $LANG_INSTALL[36] . '</option>' : '') . '
<option value="mssql"' . $mssql_selected . '>' . $LANG_INSTALL[37] . '</option></select> ' . $innodbnote . '</p>
! <p><label>' . $LANG_INSTALL[39] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_host" value="'. $db_host .'" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[40] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_name" value="'. $db_name . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[41] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_user" value="' . $db_user . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[42] . ' ' . INST_helpLink('') . '</label> <input type="password" name="db_pass" value="' . $db_pass . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[43] . ' ' . INST_helpLink('') . '</label> <input type="text" name="db_prefix" value="' . $db_prefix . '" size="20"' . XHTML . '></p>
<br' . XHTML . '>
<h2>' . $LANG_INSTALL[44] . '</h2>
! <p><label>' . $LANG_INSTALL[45] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_url" value="' . $site_url . '" size="50"' . XHTML . '> ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50"' . XHTML . '> ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50"' . XHTML . '></p>';
if ($install_type == 'install') {
$display .= '
! <p><label>' . $LANG_INSTALL[92] . ' ' . INST_helpLink('') . '</label> <input type="checkbox" name="utf8"' . ($utf8 ? ' checked="checked"' : '') . XHTML . '></p>';
}
--- 196,220 ----
<p><label>' . $LANG_INSTALL[32] . ' ' . INST_helpLink('site_name') . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="40"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[33] . ' ' . INST_helpLink('site_slogan') . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="40"' . XHTML . '></p><br' . XHTML . '>
! <p><label>' . $LANG_INSTALL[34] . ' ' . INST_helpLink('db_type') . '</label> <select name="db_type">
<option value="mysql"' . $mysql_selected . '>' . $LANG_INSTALL[35] . '</option>
' . ($install_type == 'install' ? '<option value="mysql-innodb"' . $mysql_innodb_selected . '>' . $LANG_INSTALL[36] . '</option>' : '') . '
<option value="mssql"' . $mssql_selected . '>' . $LANG_INSTALL[37] . '</option></select> ' . $innodbnote . '</p>
! <p><label>' . $LANG_INSTALL[39] . ' ' . INST_helpLink('db_host') . '</label> <input type="text" name="db_host" value="'. $db_host .'" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[40] . ' ' . INST_helpLink('db_name') . '</label> <input type="text" name="db_name" value="'. $db_name . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[41] . ' ' . INST_helpLink('db_user') . '</label> <input type="text" name="db_user" value="' . $db_user . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[42] . ' ' . INST_helpLink('db_pass') . '</label> <input type="password" name="db_pass" value="' . $db_pass . '" size="20"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[43] . ' ' . INST_helpLink('db_prefix') . '</label> <input type="text" name="db_prefix" value="' . $db_prefix . '" size="20"' . XHTML . '></p>
<br' . XHTML . '>
<h2>' . $LANG_INSTALL[44] . '</h2>
! <p><label>' . $LANG_INSTALL[45] . ' ' . INST_helpLink('site_url') . '</label> <input type="text" name="site_url" value="' . $site_url . '" size="50"' . XHTML . '> ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[47] . ' ' . INST_helpLink('site_admin_url') . '</label> <input type="text" name="site_admin_url" value="' . $site_admin_url . '" size="50"' . XHTML . '> ' . $LANG_INSTALL[46] . '</p>
! <p><label>' . $LANG_INSTALL[48] . ' ' . INST_helpLink('site_mail') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
! <p><label>' . $LANG_INSTALL[49] . ' ' . INST_helpLink('noreply_mail') . '</label> <input type="text" name="noreply_mail" value="' . $noreply_mail . '" size="50"' . XHTML . '></p>';
if ($install_type == 'install') {
$display .= '
! <p><label>' . $LANG_INSTALL[92] . ' ' . INST_helpLink('utf8') . '</label> <input type="checkbox" name="utf8"' . ($utf8 ? ' checked="checked"' : '') . XHTML . '></p>';
}
More information about the geeklog-cvs
mailing list