[geeklog-cvs] Geeklog-1.x/public_html/admin/install help.php, 1.5, 1.6 index.php, 1.42, 1.43
Dirk Haun
dhaun at qs1489.pair.com
Sat May 31 17:36:17 EDT 2008
Update of /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv76754/public_html/admin/install
Modified Files:
help.php index.php
Log Message:
Fixed problems with the text direction in the install script (reported by LWC)
Index: help.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/help.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** help.php 29 May 2008 19:38:59 -0000 1.5
--- help.php 31 May 2008 21:36:15 -0000 1.6
***************
*** 74,88 ****
</div>
</div>
! <div class="header-logobg-container-outer">
! <table width="100%" border="0" cellpadding="0" cellspacing="0" class="header-logobg-container-inner">
! <tr>
! <td class="header-logobg-left">
! <a href="http://www.geeklog.net/"><img src="layout/logo.png" width="151" height="56" alt="Geeklog" border="0"' . XHTML . '></a>
! </td>
! <td class="header-logobg-right">
! <div class="site-slogan">' . $LANG_INSTALL[2] . ' <br' . XHTML . '><br' . XHTML . '>
! </td>
! </tr>
! </table>
</div>
<div class="installation-container">
--- 74,82 ----
</div>
</div>
! <div class="header-logobg-container-inner">
! <a class="header-logo" href="http://www.geeklog.net/">
! <img src="layout/logo.png" width="151" height="56" alt="Geeklog"' . XHTML . '>
! </a>
! <div class="header-slogan">' . $LANG_INSTALL[2] . ' <br' . XHTML . '><br' . XHTML . '></div>
</div>
<div class="installation-container">
Index: index.php
===================================================================
RCS file: /cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** index.php 27 May 2008 17:45:46 -0000 1.42
--- index.php 31 May 2008 21:36:15 -0000 1.43
***************
*** 118,122 ****
function INST_installEngine($install_type, $install_step)
{
! global $_CONF, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_TABLES, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language;
switch ($install_step) {
--- 118,122 ----
function INST_installEngine($install_type, $install_step)
{
! global $_CONF, $LANG_INSTALL, $LANG_CHARSET, $_DB, $_TABLES, $gl_path, $html_path, $dbconfig_path, $siteconfig_path, $display, $language, $label_dir;
switch ($install_step) {
***************
*** 195,220 ****
<input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>
! <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>';
}
--- 195,220 ----
<input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>
! <p><label class="' . $label_dir . '">' . $LANG_INSTALL[32] . ' ' . INST_helpLink('site_name') . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="40"' . XHTML . '></p>
! <p><label class="' . $label_dir . '">' . $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 class="' . $label_dir . '">' . $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 class="' . $label_dir . '">' . $LANG_INSTALL[39] . ' ' . INST_helpLink('db_host') . '</label> <input type="text" name="db_host" value="'. $db_host .'" size="20"' . XHTML . '></p>
! <p><label class="' . $label_dir . '">' . $LANG_INSTALL[40] . ' ' . INST_helpLink('db_name') . '</label> <input type="text" name="db_name" value="'. $db_name . '" size="20"' . XHTML . '></p>
! <p><label class="' . $label_dir . '">' . $LANG_INSTALL[41] . ' ' . INST_helpLink('db_user') . '</label> <input type="text" name="db_user" value="' . $db_user . '" size="20"' . XHTML . '></p>
! <p><label class="' . $label_dir . '">' . $LANG_INSTALL[42] . ' ' . INST_helpLink('db_pass') . '</label> <input type="password" name="db_pass" value="' . $db_pass . '" size="20"' . XHTML . '></p>
! <p><label class="' . $label_dir . '">' . $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 class="' . $label_dir . '">' . $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 class="' . $label_dir . '">' . $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 class="' . $label_dir . '">' . $LANG_INSTALL[48] . ' ' . INST_helpLink('site_mail') . '</label> <input type="text" name="site_mail" value="' . $site_mail . '" size="50"' . XHTML . '></p>
! <p><label class="' . $label_dir . '">' . $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 class="' . $label_dir . '">' . $LANG_INSTALL[92] . ' ' . INST_helpLink('utf8') . '</label> <input type="checkbox" name="utf8"' . ($utf8 ? ' checked="checked"' : '') . XHTML . '></p>';
}
***************
*** 428,432 ****
<input type="hidden" name="step" value="3"' . XHTML . '>
<input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>
! <p><label>' . $LANG_INSTALL[89] . '</label> <select name="version">';
$tmp_counter = 0;
$ver_selected = '';
--- 428,432 ----
<input type="hidden" name="step" value="3"' . XHTML . '>
<input type="hidden" name="dbconfig_path" value="' . $dbconfig_path . '"' . XHTML . '>
! <p><label class="' . $label_dir . '">' . $LANG_INSTALL[89] . '</label> <select name="version">';
$tmp_counter = 0;
$ver_selected = '';
***************
*** 1626,1629 ****
--- 1626,1634 ----
$LANG_DIRECTION = 'ltr';
}
+ if ($LANG_DIRECTION == 'rtl') {
+ $label_dir = 'label-right';
+ } else {
+ $label_dir = 'label-left';
+ }
$display .= '<head>
<meta http-equiv="Content-Type" content="text/html;charset=' . $LANG_CHARSET . '"' . XHTML . '>
***************
*** 1639,1654 ****
</div>
</div>
! <div class="header-logobg-container-outer">
! <table width="100%" border="0" cellpadding="0" cellspacing="0" class="header-logobg-container-inner">
! <tr>
! <td class="header-logobg-left">
! <a href="http://www.geeklog.net/"><img src="layout/logo.png" width="151" height="56" alt="Geeklog" border="0"' . XHTML . '></a>
! </td>
! <td class="header-logobg-right">
! <div class="site-slogan">' . $LANG_INSTALL[2] . ' <br' . XHTML . '><br' . XHTML . '>' . LB;
// Show the language drop down selection on the first page
if ($mode == 'check_permissions') {
! $display .='<form action="index.php" method="post">' . LB;
$_PATH = array('dbconfig', 'public_html');
--- 1644,1656 ----
</div>
</div>
! <div class="header-logobg-container-inner">
! <a class="header-logo" href="http://www.geeklog.net/">
! <img src="layout/logo.png" width="151" height="56" alt="Geeklog"' . XHTML . '>
! </a>
! <div class="header-slogan">' . $LANG_INSTALL[2] . ' <br' . XHTML . '><br' . XHTML . '>' . LB;
// Show the language drop down selection on the first page
if ($mode == 'check_permissions') {
! $display .='<form action="index.php" method="post" style="display:inline;">' . LB;
$_PATH = array('dbconfig', 'public_html');
***************
*** 1676,1683 ****
}
$display .= '
! </div>
! </td>
! </tr>
! </table>
</div>
<div class="installation-container">
--- 1678,1682 ----
}
$display .= '
! </div>
</div>
<div class="installation-container">
***************
*** 1933,1936 ****
--- 1932,1940 ----
. '&language=' . $language;
+ if ($LANG_DIRECTION == 'rtl') {
+ $upgr_class = 'upgrade-rtl';
+ } else {
+ $upgr_class = 'upgrade';
+ }
$display .= '
<div class="install-type-container-outer">
***************
*** 1939,1943 ****
<div class="install" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a href="' . $req_string
. '&op=install">' . $LANG_INSTALL[24] . '</a></div>
! <div class="upgrade" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a href="' . $req_string
. '&op=upgrade">' . $LANG_INSTALL[25] . '</a></div>
</div>
--- 1943,1947 ----
<div class="install" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a href="' . $req_string
. '&op=install">' . $LANG_INSTALL[24] . '</a></div>
! <div class="' . $upgr_class . '" onmouseover="this.style.background=\'#BBB\'" onmouseout="this.style.background=\'#CCC\'"><a href="' . $req_string
. '&op=upgrade">' . $LANG_INSTALL[25] . '</a></div>
</div>
More information about the geeklog-cvs
mailing list