Fix to the xml automation export and various other changes

- xml export now correctly exports all attachments if specified as parameter

- print view fixes

- disclaimer for old IE versions (< 10) and compatibility mode users when viewing the statistics (The heatmap calendar requires 10+)
pull/224/head
iglocska 2014-03-03 12:00:48 +01:00
parent 14f2dc374c
commit a2bf7a3362
6 changed files with 30 additions and 8 deletions

View File

@ -1237,10 +1237,12 @@ class EventsController extends AppController {
if ($withAttachment) {
$this->loadModel('Attribute');
foreach ($results[0]['Attribute'] as &$attribute) {
if ($this->Attribute->typeIsAttachment($attribute['type'])) {
$encodedFile = $this->Attribute->base64EncodeAttachment($attribute);
$attribute['data'] = $encodedFile;
foreach ($results as &$result) {
foreach ($result['Attribute'] as &$attribute) {
if ($this->Attribute->typeIsAttachment($attribute['type'])) {
$encodedFile = $this->Attribute->base64EncodeAttachment($attribute);
$attribute['data'] = $encodedFile;
}
}
}
}

View File

@ -172,7 +172,7 @@ $mayPublish = ($isAclPublish && $event['Event']['orgc'] == $me['org']);
<?php endif; ?>
</div>
<br />
<div>
<div class="toggleButtons">
<button class="btn btn-inverse toggle-left btn.active qet" id="pivots_active">
<span class="icon-minus icon-white" style="vertical-align:top;"></span>Pivots
</button>

View File

@ -50,7 +50,7 @@
</div>
<div
<?php
if (Configure::read('debug') == 0) echo "style=\"padding-top:100px;\"";
if (Configure::read('debug') == 0) echo 'class="topGap"';
?>
>
<?php echo $this->fetch('content'); ?>

View File

@ -109,6 +109,19 @@ function goLeft() {
cal.previous();
}
</script>
<?php
if (preg_match('/(?i)msie [2-9]/',$_SERVER['HTTP_USER_AGENT']) && !strpos($_SERVER['HTTP_USER_AGENT'], 'Opera')) {
if (preg_match('%(?i)Trident/(.*?).0%', $_SERVER['HTTP_USER_AGENT'], $matches) && isset($matches[1]) && $matches[1] > 5) {
?>
<br /><br /><p style="color:red;font-size:11px;">The above graph will not work correctly in Compatibility mode. Please make sure that it is disabled in your Internet Explorer settings.</p>
<?php
} else {
?>
<br /><br /><p style="color:red;font-size:11px;">The above graph will not work correctly on Internet Explorer 9.0 and earlier. Please download Chrome, Firefox or upgrade to a newer version of Internet Explorer.</p>
<?php
}
}
?>
</div>
<?php
echo $this->element('side_menu', array('menuList' => 'globalActions', 'menuItem' => 'statistics'));

View File

@ -639,6 +639,9 @@ a.proposal_link_red:hover {
color:white;
}
.topGap {
padding-top:100px;
}
@-webkit-keyframes rotation {
from {-webkit-transform: rotate(0deg);}

View File

@ -3,7 +3,11 @@
display: none;
}
div.view{
.topGap {
padding-top:0px;
}
div.view, div.index{
width: 99% !important;
}
@ -11,6 +15,6 @@ div.view{
display: none;
}
a[href]:after{
a[href]:after, .tagSecondHalf{
content:none;
}