Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
mantisbt/mantisbt
01-Scripts/mantisbt
0xhacking/mantisbt
AbsolutelyFreeWeb/mantisbt
Adventsparky/mantisbt
CeciliaDatko/mantisbt
Cyberocioso/mantisbt
Cyberport-GmbH/mantisbt
DKuranov/mantisbt
Dentxinho/mantisbt
DigNative/ReqManToo
DragonBe/mantisbt
Elompenta/mantisbt
EnISeeK/mantisbt
FavioGalvis/Inforequest
Jay15761/mantisbt
Jguilbaud/mantisbt
Kels/mantisbt
Kirill/mantisbt
MRa53639/mantisbt
Mathnerd314/mantisbt
MatthieuR/mantisbt
MrBricodage/mantisbt
RintarouTW/mantisbt
Ruthion/mantisbt
Skhou/mantisbt
ThomasKresnicka/mantisbt
TomR/mantisbt
VVVi/mantisbt
VeMag/mantisbt
Vinny49/mantisbt
Votyer/mantisbt
Wizmaster/mantisbt
Zuko/mantisbt
aakashrajmathur/mantisbt
abrenoch/mantisbt
afortaleza/mantisbt
akartynnik/mantisbt
alessandroleite/mantisbt
andersruneson/mantisbt
arturaz/mantisbt
ashumkin/mantisbt
atrol/mantisbt
azurebelle00/mantisbt
badfiles/mantisbt
baz4/mantisbt
benoitrolland/mantisbt-pagesperso.free.fr
benv8nam/mantisbt
bieli/mantisbt
bitifet/mantisbt
bpcampbe/mantisbt
branigan/mantisbt
brenard/mantisbt
bstidham/mantisbt
cainianhua/mantisbt
carmenates09/mantisbt
chalx/mantisbt
chenjundong/mantisbt
choppedcode/mantisbt
clagiordano/mantisbt
clouddrd/mantisbt
coan/mantisbt
codyrobert/mantisbt
cybd/mantisbt
darcoto/mantisbt
daryn/mantisbt
davidxchen/mantisbt
debuggings/mantisbt
derherrf/mantisbt
derrickweaver/mantisbt
dineshkummarc/mantisbt
dmolotkov/mantisbt
dregad/mantisbt
dtamajon/mantisbt
dud3/mantisbt
eakzs/mantisbt
eewebadmin/mantisbt
egi/mantisbt
elipavlov/mantisbt
emzec/mantisbt
fdsawrewqrewqr/mantisbt
fusenigk/mantisbt
gabriellevan/mantisbt
gbeine/mantisbt
gcompagnon/mantisbt
gitter-badger/mantisbt
gyongyeee/mantisbt
hazerd/mantisbt
hezuo/mantisbt
hloehnert/mantisbt
iwapheds/mantisbt
jamiepg1/mantisbt
jeckyhl/mantisbt
jlmanrique/mantisbt
jmleroux/mantisbt
joe-parente/mantisbt
jpanic/mantisbt
jphustman/mantisbt
justinweb/mantisbt
jvizueta/mantisbt
kaimallea/mantisbt
kaos/mantisbt
kensonman/mantisbt
kevin556/mantisbt
kibal4iw/mantisbt
kichiweb/mantisbt
kkroflin/mantisbt
koganei/mantisbt
kuzn2k/mantisbt
langerheiko/mantisbt
lazar2606/mantisbt
lbayle/mantisbt
leandrotlz/mantisbt
lezouretalice/mantisbt
lincolnwung/mantisbt
lioofy/mantisbt
lkinley/mantisbt
lmartelli/mantisbt
lnsoso/mantisbt
lukaszkujawa/mantisbt
ma33/mantisbt
manpreetbhasin/mantisbt
mantishub/mantisbt
marcodings/mantisbt
markkimsal/mantisbt
martelkevin/mantisbt
martynbiz/mantisbt
mattwillmart/mantisbt
mburamorde/mantisbt
mcs/mantisbt
mfoXen/mantisbt
mgrdcm/mantisbt
mgretler/mantisbt
mhabrnal/mantisbt
mmarquez/mantisbt
mrschyte/mantisbt
mskarupianski/mantisbt
n3wtron/mantisbt
namvan/mantisbt
neilmillard/mantisbt
netsf/mantisbt
nevvermind/mantisbt
nextgens/mantisbt
ngharo/mantisbt
nsatragno/mantisbt_mobile
obustamante/mantisbt
oranwood/mantisbt
outsource/mantisbt
ponzmanman/mantisbt
qadriinfotech/mantisbt
rasperen/mantisbt
raultm/mantisbt
rkaiser0324/mantisbt
rlaloux/mantisbt
rlerdorf/mantisbt
rombert/mantisbt
ronan-lins/MantisMQ
rranjan19/mantisbt
rsuyambu/mantisbt
russor/mantisbt
san45/mantisbt
schriftgestalt/mantisbt
semicolonth/mantisbt
shekhei/mantisbt
siniguru/mantisbt
skayser/mantisbt
ssnukala/mantisbt
stovocor/mantisbt
sub1ime/mantisbt
symsec/mantisbt
syncguru/mantisbt
tao-gong/mantisbt
terencejackson/mantisbt
thinkl33t/mantisbt
thomasdingler/mantisbt
thraxisp/mantisbt
tilakkhullar/mantisbt
timokhin/mantisbt
toddpw/mantisbt
tswestendorp/mantisbt
turb/mantisbt
tuxedo/mantisbt
uncletall/mantisbt
urkle/mantisbt
vboctor/mantisbt
vibe972/mantisbt
vincentsels/mantisbt
vmexell/mantisbt
voevoda/mantisbt
waxberrypy/mantisbt
wentianle/mantisbt
wepl/mantisbt
winston01/mantisbt
wupojung/mantisbt
xiangnap/mantisbt
xiaoyanit/mantisbt
yellowandy/mantisbt
zdroyer/mantisbt
zhanghongyan/mantisbt
zniczu220381/mantisbt
Nothing to show
...
Choose a Head Repository
mantisbt/mantisbt
01-Scripts/mantisbt
0xhacking/mantisbt
AbsolutelyFreeWeb/mantisbt
Adventsparky/mantisbt
CeciliaDatko/mantisbt
Cyberocioso/mantisbt
Cyberport-GmbH/mantisbt
DKuranov/mantisbt
Dentxinho/mantisbt
DigNative/ReqManToo
DragonBe/mantisbt
Elompenta/mantisbt
EnISeeK/mantisbt
FavioGalvis/Inforequest
Jay15761/mantisbt
Jguilbaud/mantisbt
Kels/mantisbt
Kirill/mantisbt
MRa53639/mantisbt
Mathnerd314/mantisbt
MatthieuR/mantisbt
MrBricodage/mantisbt
RintarouTW/mantisbt
Ruthion/mantisbt
Skhou/mantisbt
ThomasKresnicka/mantisbt
TomR/mantisbt
VVVi/mantisbt
VeMag/mantisbt
Vinny49/mantisbt
Votyer/mantisbt
Wizmaster/mantisbt
Zuko/mantisbt
aakashrajmathur/mantisbt
abrenoch/mantisbt
afortaleza/mantisbt
akartynnik/mantisbt
alessandroleite/mantisbt
andersruneson/mantisbt
arturaz/mantisbt
ashumkin/mantisbt
atrol/mantisbt
azurebelle00/mantisbt
badfiles/mantisbt
baz4/mantisbt
benoitrolland/mantisbt-pagesperso.free.fr
benv8nam/mantisbt
bieli/mantisbt
bitifet/mantisbt
bpcampbe/mantisbt
branigan/mantisbt
brenard/mantisbt
bstidham/mantisbt
cainianhua/mantisbt
carmenates09/mantisbt
chalx/mantisbt
chenjundong/mantisbt
choppedcode/mantisbt
clagiordano/mantisbt
clouddrd/mantisbt
coan/mantisbt
codyrobert/mantisbt
cybd/mantisbt
darcoto/mantisbt
daryn/mantisbt
davidxchen/mantisbt
debuggings/mantisbt
derherrf/mantisbt
derrickweaver/mantisbt
dineshkummarc/mantisbt
dmolotkov/mantisbt
dregad/mantisbt
dtamajon/mantisbt
dud3/mantisbt
eakzs/mantisbt
eewebadmin/mantisbt
egi/mantisbt
elipavlov/mantisbt
emzec/mantisbt
fdsawrewqrewqr/mantisbt
fusenigk/mantisbt
gabriellevan/mantisbt
gbeine/mantisbt
gcompagnon/mantisbt
gitter-badger/mantisbt
gyongyeee/mantisbt
hazerd/mantisbt
hezuo/mantisbt
hloehnert/mantisbt
iwapheds/mantisbt
jamiepg1/mantisbt
jeckyhl/mantisbt
jlmanrique/mantisbt
jmleroux/mantisbt
joe-parente/mantisbt
jpanic/mantisbt
jphustman/mantisbt
justinweb/mantisbt
jvizueta/mantisbt
kaimallea/mantisbt
kaos/mantisbt
kensonman/mantisbt
kevin556/mantisbt
kibal4iw/mantisbt
kichiweb/mantisbt
kkroflin/mantisbt
koganei/mantisbt
kuzn2k/mantisbt
langerheiko/mantisbt
lazar2606/mantisbt
lbayle/mantisbt
leandrotlz/mantisbt
lezouretalice/mantisbt
lincolnwung/mantisbt
lioofy/mantisbt
lkinley/mantisbt
lmartelli/mantisbt
lnsoso/mantisbt
lukaszkujawa/mantisbt
ma33/mantisbt
manpreetbhasin/mantisbt
mantishub/mantisbt
marcodings/mantisbt
markkimsal/mantisbt
martelkevin/mantisbt
martynbiz/mantisbt
mattwillmart/mantisbt
mburamorde/mantisbt
mcs/mantisbt
mfoXen/mantisbt
mgrdcm/mantisbt
mgretler/mantisbt
mhabrnal/mantisbt
mmarquez/mantisbt
mrschyte/mantisbt
mskarupianski/mantisbt
n3wtron/mantisbt
namvan/mantisbt
neilmillard/mantisbt
netsf/mantisbt
nevvermind/mantisbt
nextgens/mantisbt
ngharo/mantisbt
nsatragno/mantisbt_mobile
obustamante/mantisbt
oranwood/mantisbt
outsource/mantisbt
ponzmanman/mantisbt
qadriinfotech/mantisbt
rasperen/mantisbt
raultm/mantisbt
rkaiser0324/mantisbt
rlaloux/mantisbt
rlerdorf/mantisbt
rombert/mantisbt
ronan-lins/MantisMQ
rranjan19/mantisbt
rsuyambu/mantisbt
russor/mantisbt
san45/mantisbt
schriftgestalt/mantisbt
semicolonth/mantisbt
shekhei/mantisbt
siniguru/mantisbt
skayser/mantisbt
ssnukala/mantisbt
stovocor/mantisbt
sub1ime/mantisbt
symsec/mantisbt
syncguru/mantisbt
tao-gong/mantisbt
terencejackson/mantisbt
thinkl33t/mantisbt
thomasdingler/mantisbt
thraxisp/mantisbt
tilakkhullar/mantisbt
timokhin/mantisbt
toddpw/mantisbt
tswestendorp/mantisbt
turb/mantisbt
tuxedo/mantisbt
uncletall/mantisbt
urkle/mantisbt
vboctor/mantisbt
vibe972/mantisbt
vincentsels/mantisbt
vmexell/mantisbt
voevoda/mantisbt
waxberrypy/mantisbt
wentianle/mantisbt
wepl/mantisbt
winston01/mantisbt
wupojung/mantisbt
xiangnap/mantisbt
xiaoyanit/mantisbt
yellowandy/mantisbt
zdroyer/mantisbt
zhanghongyan/mantisbt
zniczu220381/mantisbt
Nothing to show
  • 6 commits
  • 3 files changed
  • 0 commit comments
  • 1 contributor
Commits on Feb 26, 2014
Install: fix HTML and layout
- added missing tr and td tags
- moved incorrectly placed closing form tag
- move config_inc.php table within cell of parent
- make final status and link a table instead of paragraph
CSS: fix padding for main menu items
Old CSS caused the menu item's link to extend from the right of the text
until the vertical bar, while the padding to the left was not
hyperlinked.

The item's text is now centered within the CSS box instead of
left-justified, fixing that behavior.
Increase size of bug jump form text field
Size of 4 was too small to fit the default 7-char bug id
Showing with 77 additions and 44 deletions.
  1. +73 −40 admin/install.php
  2. +1 −1 core/html_api.php
  3. +3 −3 css/default.css
View
@@ -381,8 +381,6 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
# due to a bug in ADODB, this call prompts warnings, hence the @
# the check only works on mysql if the database is open
$t_version_info = @$g_db->ServerInfo();
- echo '<br /> Running ' . $f_db_type . ' version ' . nl2br( $t_version_info['description'] );
-
} else {
print_test_result( BAD, true, 'Does administrative user have access to the database? ( ' . db_error_msg() . ' )' );
}
@@ -686,6 +684,8 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
</tr>
</table>
+</form>
+
<?php
} # end install_state == 1
@@ -794,7 +794,7 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
print_test_result( BAD, false, 'Database user doesn\'t have access to the database ( ' . db_error_msg() . ' )' );
}
$g_db->Close();
- ?>
+ ?>
</tr>
<?php
}
@@ -895,11 +895,11 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
foreach( $sqlarray as $sql ) {
# "CREATE OR REPLACE TRIGGER" statements must end with "END;\n/" for Oracle sqlplus
if ( $f_db_type == 'oci8' && stripos( $sql, 'CREATE OR REPLACE TRIGGER' ) === 0 ) {
- $t_sql_end = "\n/";
+ $t_sql_end = PHP_EOL . "/";
} else {
$t_sql_end = ";";
}
- echo htmlentities( $sql ) . $t_sql_end . "\n\n";
+ echo htmlentities( $sql ) . $t_sql_end . PHP_EOL . PHP_EOL;
}
}
} else {
@@ -935,7 +935,7 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
}
if( $f_log_queries ) {
# add a query to set the database version
- echo 'INSERT INTO ' . db_get_table( 'config' ) . ' ( value, type, access_reqd, config_id, project_id, user_id ) VALUES (\'' . $lastid . '\', 1, 90, \'database_version\', 0, 0 );' . "\n";
+ echo 'INSERT INTO ' . db_get_table( 'config' ) . ' ( value, type, access_reqd, config_id, project_id, user_id ) VALUES (\'' . $lastid . '\', 1, 90, \'database_version\', 0, 0 );' . PHP_EOL;
echo '</pre><br /><p style="color:red">Your database has not been created yet. Please create the database, then install the tables and data using the information above before proceeding.</p></td></tr>';
}
}
@@ -985,49 +985,57 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
<tr>
<td bgcolor="#ffffff">
- <?php
- if( !$t_config_exists ) {
- echo 'Creating Configuration File (config_inc.php)<br />';
- echo '<span class="error-msg">(if this file is not created, create it manually with the contents below)</span>';
+<?php
+ if( !$t_config_exists ) {
+?>
+ Creating Configuration File (config_inc.php)<br />
+ <span class="error-msg">
+ (if this file is not created, create it manually with the contents below)
+ </span>
+<?php
} else {
- echo 'Updating Configuration File (config_inc.php)<br />';
+?>
+ Updating Configuration File (config_inc.php)<br />
+<?php
}
- ?>
+?>
</td>
- <?php
- $t_config = '<?php' . "\n"
- . "\$g_hostname = '$f_hostname';\n"
- . "\$g_db_type = '$f_db_type';\n"
- . "\$g_database_name = '$f_database_name';\n"
- . "\$g_db_username = '$f_db_username';\n"
- . "\$g_db_password = '$f_db_password';\n";
+<?php
+ # Generating the config_inc.php file
+
+ $t_config = '<?php' . PHP_EOL
+ . "\$g_hostname = '$f_hostname';" . PHP_EOL
+ . "\$g_db_type = '$f_db_type';" . PHP_EOL
+ . "\$g_database_name = '" . addslashes( $f_database_name ) . "';" . PHP_EOL
+ . "\$g_db_username = '" . addslashes( $f_db_username ) . "';" . PHP_EOL
+ . "\$g_db_password = '" . addslashes( $f_db_password ) . "';" . PHP_EOL;
switch( $f_db_type ) {
case 'db2':
- $t_config .= "\$g_db_schema = '$f_db_schema';\n";
+ $t_config .= "\$g_db_schema = '$f_db_schema';" . PHP_EOL;
break;
default:
break;
}
- $t_config .= "\n";
+ $t_config .= PHP_EOL;
# Add lines for table prefix/suffix if different from default
$t_insert_line = false;
foreach( $t_prefix_defaults['other'] as $t_key => $t_value ) {
$t_new_value = ${'f_' . $t_key};
if( $t_new_value != $t_value ) {
- $t_config .= '$g_' . str_pad( $t_key, 25 ) . "= '" . ${'f_' . $t_key} . "';\n";
+ $t_config .= '$g_' . str_pad( $t_key, 25 ) . "= '" . ${'f_' . $t_key} . "';" . PHP_EOL;
$t_insert_line = true;
}
}
if( $t_insert_line ) {
- $t_config .= "\n";
+ $t_config .= PHP_EOL;
}
$t_config .=
- "\$g_default_timezone = '$f_timezone';\n"
- . "\n"
- . "\$g_crypto_master_salt = '$f_crypto_master_salt';\n";
+ "\$g_default_timezone = '$f_timezone';" . PHP_EOL
+ . PHP_EOL
+ . "\$g_crypto_master_salt = '" . addslashes( $f_crypto_master_salt ) . "';" . PHP_EOL;
$t_write_failed = true;
@@ -1061,11 +1069,28 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
</tr>
<?php
if( true == $t_write_failed ) {
- echo '<tr><table width="50%" cellpadding="10" cellspacing="1">';
- echo '<tr><td>Please add the following lines to ' . $g_absolute_path . 'config_inc.php before continuing to the database upgrade check:</td></tr>';
- echo '<tr><td><pre>' . htmlentities( $t_config ) . '</pre></td></tr></table></tr>';
+?>
+<tr>
+ <td colspan="2">
+ <table width="50%" cellpadding="10" cellspacing="1">
+ <tr>
+ <td>
+ Please add the following lines to
+ '<?php echo $g_absolute_path; ?>config_inc.php'
+ before continuing to the database upgrade check:
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <pre><?php echo htmlentities( $t_config ); ?></pre>
+ </td>
+ </tr>
+ </table>
+ </td>
+</tr>
+<?php
}
- ?>
+?>
</table>
@@ -1186,19 +1211,27 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
if( 7 == $t_install_state ) {
# cleanup and launch upgrade
?>
-<p>Install was successful.</p>
+<table width="100%" bgcolor="#222222" cellpadding="10" cellspacing="1">
+<tr>
+ <td bgcolor="#e8e8e8" colspan="2">
+ <span class="title">Installation Complete...</span>
+ </td>
+</tr>
+<tr bgcolor="#ffffff">
+ <td>
+ MantisBT was installed successfully.
<?php if( $f_db_exists ) {?>
-<p><a href="../login_page.php">Continue</a> to log into Mantis</p>
-<?php
- } else {?>
-<p>Please log in as the administrator and <a href="../login_page.php">create</a> your first project.</p>
+ <a href="../login_page.php">Continue</a> to log in.
+<?php } else { ?>
+ Please log in as the administrator and <a href="../login_page.php">create</a> your first project.
+<?php } ?>
+ </td>
+ <?php print_test_result( GOOD ); ?>
+</tr>
+</table>
<?php
- }
}
-?>
-</form>
-<?php
# end install_state == 7
@@ -1207,7 +1240,7 @@ function print_test( $p_test_description, $p_result, $p_hard_fail = true, $p_mes
<table width="100%" bgcolor="#222222" cellpadding="10" cellspacing="1">
<tr>
<td bgcolor="#e8e8e8" colspan="2">
- <span class="title">Checks Failed...</span>
+ <span class="title">Installation Failed...</span>
</td>
</tr>
<tr>
View
@@ -930,7 +930,7 @@ function print_menu() {
echo '<fieldset class="bug-jump">';
# CSRF protection not required here - form does not result in modifications
echo '<input type="hidden" name="bug_label" value="' . lang_get( 'issue_id' ) . '" />';
- echo '<input type="text" name="bug_id" size="4" />&#160;';
+ echo '<input type="text" name="bug_id" size="8" />&#160;';
echo '<input type="submit" value="' . lang_get( 'jump' ) . '" />&#160;';
echo '</fieldset>';
echo '</form>';
View
@@ -129,9 +129,9 @@ tr.bugnote .time-tracked,
.main-menu { float: left; width: 100%; padding: 0; border: 1px solid #999; background-color: #e8e8e8; z-index: 99; }
.main-menu ul { clear: left; float: left; list-style: none; position: relative; margin: 0; padding: .25em; }
-.main-menu ul li { display:block; float: left; list-style: none; padding: .15em .5em; margin: 0; position: relative; }
-.main-menu ul li a { padding-right: .9em; border-right: 1px solid #000; text-decoration: underline; }
-.main-menu ul li > a#logout-link { padding-right: 0; border-right: none; }
+.main-menu ul li { display:block; float: left; list-style: none; padding: .15em 0; margin: 0; position: relative; }
+.main-menu ul li a { padding: 0 .9em; border-right: 1px solid #000; text-decoration: underline; }
+.main-menu ul li > a#logout-link { border-right: none; }
.main-menu div#bug-jump { float: right; margin: 0; padding: 2px 0; position: relative; z-index: 100; border: none; }
.main-menu input { font-size: 9pt; }

No commit comments for this range