Skip to content

GitLab

Commit eae49389 authored by Pierre.Vriens's avatar Pierre.Vriens Committed by David Metzler
Browse files

User log messages improved. 

Fix to translate function .
parent 4cab94ce
Hide whitespace changes
Inline Side-by-side
plugins/FrxControls.inc
View file @ eae49389
......@@ -21,7 +21,7 @@ class FrxControls {
'number' => 'Number',
'drupal_translation' => 'Translatable Text',
'template' => 'Field is a forena template',
'indentation' => 'Indentation',
'indentation' => 'Indentation',
);
return $formats;
}
......@@ -44,7 +44,8 @@ class FrxControls {
$field = $teng->replace($field, NULL, TRUE);
$vars = array();
if ($field) {
$vars = (array) @unserialize($field);
$vars = @unserialize($field);
if (!$vars) $vars = array();
}
return t($value, $vars);
}
......@@ -161,13 +162,13 @@ class FrxControls {
}
return $value;
}
public function indentation($value, $format_str, $teng='') {
if ($value) {
public function indentation($value, $format_str, $teng='') {
if ($value) {
$vars = array('size' => $value);
$value = theme_indentation($vars);
$value = theme_indentation($vars);
}
return $value;
return $value;
}
......
repos/reports/DrupalUserLogs.frx
View file @ eae49389
......@@ -4,9 +4,9 @@
]>
<html xmlns:frx="urn:FrxReports">
<head>
<title>User logs</title>
<title>User logs - Obsolete</title>
<frx:category>Drupal Administration</frx:category>
<frx:options />
<frx:options hidden="1" />
<frx:parameters>
<frx:parm id="name" label="User Name" require="1" desc=""
data_source="" data_field="" type="" />
......@@ -29,23 +29,8 @@
<div id="forena-1" frx:block="drupal/users_in_logs">
<h4>Log Entries for {name}</h4>
</div>
<table id="forena-3" frx:block="drupal/user_logs">
<thead>
<tr>
<th width="200px">Type</th>
<th width="200">Location</th>
<th>Timestamp</th>
</tr>
</thead>
<tbody>
<tr id="forena-4" frx:foreach="*">
<td>{type}</td>
<td>{location}</td>
<td>{timestamp}</td>
<td>{details}</td>
<td>&nbsp;</td>
</tr>
</tbody>
</table>
<div>
<p>This report is obsolete and will be removed in the next major release</p>
</div>
</body>
</html>
repos/reports/drupaladmin/user_logs.frx
View file @ eae49389
......@@ -10,8 +10,6 @@
<frx:parameters>
<frx:parm id="name" label="User Name" require="1" desc=""
data_source="" data_field="" type="" />
<frx:parm id="search" label="Search" require="0" desc=""
data_source="" data_field="" type="" />
</frx:parameters>
<frx:fields>
<frx:field id="name" link="" format="" format-string="" target="">Anonymous</frx:field>
......@@ -27,7 +25,12 @@
</head>
<body>
<div id="forena-1" frx:block="drupal/users_in_logs">
<h4>Log Entries for {name}</h4>
<h3 frx:if="!{parm.name}">Select the <strong>user name</strong> for which you want to retrieve log entries<br />
(enter it as a parameter on the collapsible parameter form above).</h3>
<div frx:if="{parm.name}">
<h3>Most recent log entries for user <strong>{parm.name}</strong>
(limited to the first 100 entries only).</h3>
</div>
</div>
<table id="forena-2" frx:block="drupal/user_logs">
<thead>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment