TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move trans from logic-less array to inside business logic. Convert tabs to spaces.

This commit is contained in:
Sam Georges 2014-08-09 12:21:17 +10:00
parent 5a36debecf
commit 13587f155c
8 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
modules/backend/widgets/ReportContainer.php
View File

@ -1,12 +1,12 @@
<?php namespace Backend\Widgets;
use Backend\Classes\WidgetBase;
use System\Classes\ApplicationException;
use Request;
use Backend\Classes\WidgetManager;
use Backend\Models\UserPreferences;
use File;
use Lang;
use Request;
use Backend\Classes\WidgetBase;
use Backend\Classes\WidgetManager;
use Backend\Models\UserPreferences;
use System\Classes\ApplicationException;
/**
* Report Container Widget
@ -315,13 +315,13 @@ class ReportContainer extends WidgetBase
$property = [
'property' => $name,
'title' => isset($params['title']) ? $params['title'] : $name,
'title' => isset($params['title']) ? Lang::get($params['title']) : $name,
'type' => isset($params['type']) ? $params['type'] : 'string'
];
foreach ($params as $name => $value) {
if (isset($property[$name])) continue;
$property[$name] = $value;
$property[$name] = Lang::get($value);
}
$result[] = $property;
@ -335,8 +335,9 @@ class ReportContainer extends WidgetBase
$result = [];
$properties = $widget->defineProperties();
foreach ($properties as $name=>$params)
foreach ($properties as $name=>$params) {
$result[$name] = $widget->property($name);
}
$result['ocWidgetWidth'] = $widget->property('ocWidgetWidth');
$result['ocWidgetNewRow'] = $widget->property('ocWidgetNewRow');

7
modules/system/reportwidgets/Status.php
View File

@ -4,7 +4,6 @@ use System\Models\Parameters;
use System\Classes\UpdateManager;
use Backend\Classes\ReportWidgetBase;
use Exception;
use Lang;
/**
* System status report widget.
@ -33,11 +32,11 @@ class Status extends ReportWidgetBase
{
return [
'title' => [
'title' => Lang::get('backend::lang.dashboard.widget_title_label'),
'default' => Lang::get('backend::lang.dashboard.status.widget_title_default'),
'title' => 'backend::lang.dashboard.widget_title_label',
'default' => 'backend::lang.dashboard.status.widget_title_default',
'type' => 'string',
'validationPattern' => '^.+$',
'validationMessage' => Lang::get('backend::lang.dashboard.widget_title_error')
'validationMessage' => 'backend::lang.dashboard.widget_title_error',
]
];
}