1
0
Fork 0
Dieser Commit ist enthalten in:
DSB 2012-11-05 19:30:10 +00:00
Ursprung bf306fb369
Commit a85629f43c
3 geänderte Dateien mit 106 neuen und 107 gelöschten Zeilen

Datei anzeigen

@ -28,10 +28,8 @@ class DumpController extends Msd_Controller_Action
$dump = new Msd_Dump();
$dump->prepareDumpProcess();
$this->view->dumpData = new StdClass();
$this->view->dumpData->nrOfDatabasesToBackup =
count($dump->dbsToBackup);
$this->view->dumpData->databasesToBackup =
implode(', ', array_keys($dump->dbsToBackup));
$this->view->dumpData->nrOfDatabasesToBackup = count($dump->dbsToBackup);
$this->view->dumpData->databasesToBackup = implode(', ', array_keys($dump->dbsToBackup));
$this->view->dumpData->sumTotal = $dump->sumTotal;
//TODO get comment from config profile
$this->view->dumpData->comment = '';
@ -63,7 +61,6 @@ class DumpController extends Msd_Controller_Action
$ret = array(
'backup_in_progress' => false,
'config_file' => $this->view->dynamicConfig->getParam('configFile')
);
echo json_encode($ret);
}

Datei anzeigen

@ -20,9 +20,11 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
/**
* Get html-img-tag for icon image
*
* @param string $name
* @param string $title
* @param int $size
* @throws Msd_Exception
*
* @param string $name Icon name
* @param string $title HTML title tag
* @param int $size Size in Pixel (defines the sub folder to load from)
*
* @return string
*/
@ -32,7 +34,7 @@ class Msd_View_Helper_GetIcon extends Zend_View_Helper_Abstract
if (!$baseUrl) {
$baseUrl = Zend_Controller_Front::getInstance()->getBaseUrl();
}
$icons = self::_getIconFilenames();
$icons = $this->_getIconFilenames();
if (!isset($icons[$name])) {
throw new Msd_Exception(
'GetIcon: unknown icon \'' . $name . '\' requested'

Datei anzeigen

@ -5,11 +5,11 @@ $this->lang = $this->parent->lang;
$this->config = $this->parent->config;
?>
<div id="dumpsettings">
<h3><?php echo $this->lang->L_FM_DUMPSETTINGS;?></h3>
<table class="bdr floatLeft" summary="Dump settings">
<h3><?php echo $this->lang->L_FM_DUMPSETTINGS;?></h3>
<table class="bdr floatLeft" summary="Dump settings">
<tr class="row-even">
<td class="small"><?php echo $this->lang->L_CONFIG_HEADLINE?></td>
<td class="small right"><?php echo $this->dynamicConfig->getParam('configFile')?></td>
<td class="small right"><?php echo $this->config->getParam('general.title')?></td>
</tr>
<tr class="dbrow">
<td class="small"><?php echo $this->lang->L_DBS?>:</td>
@ -38,19 +38,19 @@ $this->config = $this->parent->config;
<tr class="dbrow">
<td class="small nowrap"><?php echo $this->lang->L_GZIP?>:</td>
<td class="small right"><?php echo $this->dynamicConfig->getParam('compression') ? $this->lang->L_YES: $this->lang->L_NO; ?></td>
<td class="small right"><?php echo $this->dynamicConfig->getParam('compression') ? $this->lang->L_YES : $this->lang->L_NO; ?></td>
</tr>
<?php
echo $this->partial('dump/multipart.phtml', array('parent' => $this->parent));
echo $this->partial('dump/email.phtml', array('parent' => $this->parent));
echo $this->partial('dump/ftp.phtml', array('parent' => $this->parent));
<?php
echo $this->partial('dump/multipart.phtml', array('parent' => $this->parent));
echo $this->partial('dump/email.phtml', array('parent' => $this->parent));
echo $this->partial('dump/ftp.phtml', array('parent' => $this->parent));
?>
</table>
<?php
if (!empty($sumTotal['tables'])) {
?>
?>
</table>
<?php
if (!empty($sumTotal['tables'])) {
?>
<table class="bdr floatLeft" style="margin-left:12px;" summary="Info table types and records">
<tr class="thead">
<th><?php echo $this->lang->L_TABLE_TYPE;?></th>
@ -58,7 +58,7 @@ if (!empty($sumTotal['tables'])) {
$details = $sumTotal['tables'];
$keys = array_keys($details);
foreach ($keys as $tableType) {
echo '<th>'.$tableType.'</th>';
echo '<th>' . $tableType . '</th>';
}
?>
<th><?php echo $this->lang->L_INFO_SUM;?></th>
@ -69,8 +69,8 @@ if (!empty($sumTotal['tables'])) {
$tablesTotal = 0;
foreach ($keys as $tableType) {
echo '<td class="small right">'
.$this->numberFormat($details[$tableType]['tablesTotal'])
.'</td>';
. $this->numberFormat($details[$tableType]['tablesTotal'])
. '</td>';
$tablesTotal += $details[$tableType]['tablesTotal'];
}
?>
@ -84,8 +84,8 @@ if (!empty($sumTotal['tables'])) {
$recordsTotal = 0;
foreach ($keys as $tableType) {
echo '<td class="small right">'
.$this->numberFormat($details[$tableType]['recordsTotal'])
.'</td>';
. $this->numberFormat($details[$tableType]['recordsTotal'])
. '</td>';
$recordsTotal += $details[$tableType]['recordsTotal'];
}
?>
@ -99,8 +99,8 @@ if (!empty($sumTotal['tables'])) {
$datasizeTotal = 0;
foreach ($keys as $tableType) {
echo '<td class="small right">'
.$this->byteOutput($details[$tableType]['datasizeTotal'])
.'</td>';
. $this->byteOutput($details[$tableType]['datasizeTotal'])
. '</td>';
$datasizeTotal += $details[$tableType]['datasizeTotal'];
}
?>
@ -109,5 +109,5 @@ if (!empty($sumTotal['tables'])) {
</td>
</tr>
</table>
<?php } ?>
<?php } ?>
</div>