Skip to content

Commit

Permalink
Item12180: make message in box more compact
Browse files Browse the repository at this point in the history
git-svn-id: http://svn.foswiki.org/trunk@15893 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
  • Loading branch information
ArthurClemens authored and ArthurClemens committed Nov 4, 2012
1 parent 14bdb76 commit ec62b8a
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions core/lib/Foswiki/Configure/Checkers/BasicSanity.pm
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,15 @@ HERE
elsif ( !-w $this->{LocalSiteDotCfg} ) {
$this->{errors}++;
$result .= <<HERE;
Cannot write to existing configuration file.
<p><tt>$this->{LocalSiteDotCfg}</tt> is not writable.
<p>You can view the configuration, but you will not be able to save changes.
Cannot write to existing configuration file: <tt>$this->{LocalSiteDotCfg}</tt> is not writable. <br />
You can view the configuration, but you will not be able to save changes.
Please check the file and directory permissions.
HERE
}
elsif ( ( my $mess = $this->_checkCfg( \%Foswiki::cfg ) ) ) {
$this->{errors}++;
$result .= <<HERE;
The existing configuration file
<tt>$this->{LocalSiteDotCfg}</tt> doesn't seem to contain a good configuration
for Foswiki. The following problems were found:<br>
The existing configuration file <tt>$this->{LocalSiteDotCfg}</tt> doesn't seem to contain a good configuration for Foswiki. The following problems were found:<br />
$mess
<p><b>You can continue, but configure will not pick up any of the existing
settings from this file and the previous configuration will be lost.</b>
Expand All @@ -131,8 +128,7 @@ HERE
if ($errs) {
$this->{errors}++;
$result .= <<HERE;
Configuration file <tt>$this->{LocalSiteDotCfg}</tt> does not exist, and I cannot
write a new configuration file due to these errors:
Configuration file <tt>$this->{LocalSiteDotCfg}</tt> does not exist, and I cannot write a new configuration file due to these errors:
<pre/>$errs<pre>
<p>You can view the default configuration, but you will not be able to save changes.
HERE
Expand Down

0 comments on commit ec62b8a

Please sign in to comment.