Commit 929ab50e authored by metzlerd's avatar metzlerd
Browse files

Merge remote-tracking branch 'origin/7.x-4.x' into 7.x-4.x

Conflicts:
	repos/reports/drupaladmin/enabled_contributions.frx
	repos/reports/drupaladmin/sample_active_users_letter.frx
parents 408dfd3b 8e809205
<<<<<<< HEAD
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE root [ <!DOCTYPE root [
<!ENTITY nbsp "&#160;"> <!ENTITY nbsp "&#160;">
...@@ -34,3 +35,41 @@ ...@@ -34,3 +35,41 @@
</div> </div>
</body> </body>
</html> </html>
=======
<?xml version="1.0"?>
<!DOCTYPE root [
<!ENTITY nbsp "&#160;">
]>
<html xmlns:frx="urn:FrxReports">
<head>
<title>Enabled Modules and Themes</title>
<frx:category>Drupal Administration</frx:category>
<frx:options hidden="0" />
<frx:parameters>
</frx:parameters>
<frx:docgen>
</frx:docgen>
</head>
<body>
<div frx:block="drupal/enabled_modules" id="forena-1">
<table>
<thead>
<tr>
<th>name</th>
<th>owner</th>
<th>weight</th>
</tr>
</thead>
<tbody>
<tr frx:foreach="*" id="forena-2">
<td>{name}</td>
<td>{owner}</td>
<td>{weight}</td>
</tr>
</tbody>
</table>
</div>
</body>
</html>
>>>>>>> origin/7.x-4.x
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE root [ <!DOCTYPE root [
<!ENTITY nbsp "&#160;"> <!ENTITY nbsp "&#160;">
]> ]>
<html xmlns:frx="urn:FrxReports"> <html xmlns:frx="urn:FrxReports">
<head> <head>
<title>Active Users Email</title> <title>Active Users Email</title>
<frx:category>Drupal Administration</frx:category> <frx:category>Drupal Administration</frx:category>
<frx:options /> <frx:options />
<frx:parameters> <frx:parameters>
</frx:parameters> </frx:parameters>
<frx:docgen> <frx:docgen>
<frx:doc type="email" /> <frx:doc type="email" />
<frx:doc type="h">h</frx:doc> </frx:docgen>
<frx:doc type="e">e</frx:doc> <frx:fields>
</frx:docgen> <frx:field id="mail" link="" format="" format-string="" target="" />
<frx:fields> <frx:field id="name" link="" format="" format-string="" target="" />
<frx:field id="mail" link="" format="" format-string="" target="" /> </frx:fields>
<frx:field id="name" link="" format="" format-string="" target="" /> </head>
</frx:fields> <body>
</head> <div frx:block="drupal/active_users" id="forena-1" frx:foreach="*" class="FrxEmailMerge">
<body> <div class="email-document">
<div frx:block="drupal/active_users" id="forena-1" frx:foreach="*" class="FrxEmailMerge"> <div>
<div class="email-document"> <table>
<div> <tbody>
<table> <tr>
<tbody> <th>From</th>
<tr> <td class="email-header-from">metzlerd@evergreen.edu</td>
<th>From</th> </tr>
<td class="email-header-from">metzlerd@evergreen.edu</td> <tr>
</tr> <th>To</th>
<tr> <td class="email-header-to">{mail}</td>
<th>To</th> </tr>
<td class="email-header-to">{mail}</td> <tr>
</tr> <th>Subject</th>
<tr> <td class="email-header-subject">Sample Email</td>
<th>Subject</th> </tr>
<td class="email-header-subject">Sample Email</td> </tbody>
</tr> </table>
</tbody> </div>
</table> <div class="email-body">
</div> <p>Dear {name}</p>
<div class="email-body"> <p>This is a sample letter that demonstrates the ability to
<p>Dear {name}</p> send email to all active users of a drupal site. Copy or save
<p>This is a sample letter that demonstrates the ability to this report as a different name, prior to customizing it or
send email to all active users of a drupal site. Copy or save the report will be overwritten during future upgrades to
this report as a different name, prior to customizing it or forena.</p>
the report will be overwritten during future upgrades to </div>
forena.</p> </div>
</div> </div>
</div> </body>
</div> </html>
</body>
</html>
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