* finish task #2096,2097.

This commit is contained in:
wangyidong
2014-10-27 08:15:53 +00:00
parent 6bc987d4a2
commit fba4010d06
3 changed files with 5 additions and 4 deletions
+1
View File
@@ -1,3 +1,4 @@
.alert-link:hover {text-decoration: underline;}
.alert {width: 100%; display: table;}
code{padding-left:0px;}
.alert.with-icon .icon-ok-sign, .alert.with-icon .icon-info-sign{padding-top:18px;vertical-align:top;}
+2 -2
View File
@@ -480,9 +480,9 @@ class extensionModel extends model
}
if($return->errors) $return->result = 'fail';
$return->mkdirCommands = '<code>' . str_replace('/', DIRECTORY_SEPARATOR, $return->mkdirCommands) . '</code>';
$return->mkdirCommands = empty($return->mkdirCommands) ? '' : '<code>' . str_replace('/', DIRECTORY_SEPARATOR, $return->mkdirCommands) . '</code>';
$return->errors .= $this->lang->extension->executeCommands . $return->mkdirCommands;
if(PHP_OS == 'Linux') $return->errors .= '<code>' . $return->chmodCommands . '</code>';
if(PHP_OS == 'Linux') $return->errors .= empty($return->chmodCommands) ? '' : '<code>' . $return->chmodCommands . '</code>';
return $return;
}
+2 -2
View File
@@ -30,7 +30,7 @@
</div>
</div>
<?php elseif(!empty($error)):?>
<div class='alert alert-danger with-icon'>
<div class='alert alert-pure with-icon'>
<i class='icon-info-sign'></i>
<div class='content'>
<?php
@@ -45,7 +45,7 @@
<div class='content'>
<?php
echo "<h3>{$title}</h3>";
if(!empty($backupFile)) echo "<p style='color:red'>" . sprintf($lang->extension->backDBFile, $backupFile) . '</p>';
if(!empty($backupFile)) echo "<p>" . sprintf($lang->extension->backDBFile, $backupFile) . '</p>';
if($removeCommands)
{
echo "<p class='strong'>{$lang->extension->unremovedFiles}</p>";