'.$sRet.'
';
+ }
+}
/**
* A stop watch is an ormStopWatch object, it is stored as several columns in the database
*
diff --git a/core/cmdbchangeop.class.inc.php b/core/cmdbchangeop.class.inc.php
index 83170f2d1..f6145083d 100644
--- a/core/cmdbchangeop.class.inc.php
+++ b/core/cmdbchangeop.class.inc.php
@@ -355,11 +355,19 @@ class CMDBChangeOpSetAttributeBlob extends CMDBChangeOpSetAttribute
$sAttName = $this->Get('attcode');
}
$oPrevDoc = $this->Get('prevdata');
- $sDocView = $oPrevDoc->GetAsHtml();
- $sDocView .= "".Dict::Format('UI:OpenDocumentInNewWindow_',$oPrevDoc->GetDisplayLink(get_class($this), $this->GetKey(), 'prevdata')).", \n"; - $sDocView .= Dict::Format('UI:DownloadDocument_', $oPrevDoc->GetDownloadLink(get_class($this), $this->GetKey(), 'prevdata'))."\n"; - //$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata'); - $sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sDocView); + if ($oPrevDoc->IsEmpty()) + { + $sPrevious = ''; + $sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sPrevious); + } + else + { + $sDocView = $oPrevDoc->GetAsHtml(); + $sDocView .= "
".Dict::Format('UI:OpenDocumentInNewWindow_', $oPrevDoc->GetDisplayLink(get_class($this), $this->GetKey(), 'prevdata')).", \n"; + $sDocView .= Dict::Format('UI:DownloadDocument_', $oPrevDoc->GetDownloadLink(get_class($this), $this->GetKey(), 'prevdata'))."\n"; + //$sDocView = $oPrevDoc->GetDisplayInline(get_class($this), $this->GetKey(), 'prevdata'); + $sResult = Dict::Format('Change:AttName_Changed_PreviousValue_OldValue', $sAttName, $sDocView); + } } return $sResult; } diff --git a/core/pdfbulkexport.class.inc.php b/core/pdfbulkexport.class.inc.php index 4444b27c8..ba50e8cff 100644 --- a/core/pdfbulkexport.class.inc.php +++ b/core/pdfbulkexport.class.inc.php @@ -187,6 +187,55 @@ EOF return $sPDF; } + protected function GetValue($oObj, $sAttCode) + { + switch($sAttCode) + { + case 'id': + $sRet = parent::GetValue($oObj, $sAttCode); + break; + + default: + $value = $oObj->Get($sAttCode); + if ($value instanceof ormDocument) + { + $oAttDef = MetaModel::GetAttributeDef(get_class($oObj), $sAttCode); + if ($oAttDef instanceof AttributeImage) + { + // To limit the image size in the PDF output, we have to enforce the size as height/width because max-width/max-height have no effect + // + list($iWidth, $iHeight) = utils::GetImageSize($value->GetData()); + $iMaxWidthPx = min(48, $oAttDef->Get('display_max_width')); + $iMaxHeightPx = min(48, $oAttDef->Get('display_max_height')); + + $fScale = min($iMaxWidthPx / $iWidth, $iMaxHeightPx / $iHeight); + $iNewWidth = $iWidth * $fScale; + $iNewHeight = $iHeight * $fScale; + if ($value->IsEmpty()) + { + $sUrl = $oAttDef->Get('default_image'); + $sRet = '
'.$sRet.'
';
+ }
+ else
+ {
+ $sRet = parent::GetValue($oObj, $sAttCode);
+ }
+ }
+ else
+ {
+ $sRet = parent::GetValue($oObj, $sAttCode);
+ }
+ }
+ return $sRet;
+ }
+
public function GetSupportedFormats()
{
return array('pdf' => Dict::S('Core:BulkExport:PDFFormat'));
diff --git a/core/spreadsheetbulkexport.class.inc.php b/core/spreadsheetbulkexport.class.inc.php
index 884e3d4b7..a170a6ed8 100644
--- a/core/spreadsheetbulkexport.class.inc.php
+++ b/core/spreadsheetbulkexport.class.inc.php
@@ -143,6 +143,10 @@ EOF
{
$sRet = $value->GetTimeSpent();
}
+ elseif ($value instanceof ormDocument)
+ {
+ $sRet = '';
+ }
elseif ($oAttDef instanceof AttributeString)
{
$sRet = $oObj->GetAsHTML($sAttCode);
diff --git a/css/light-grey.css b/css/light-grey.css
index 25351e1b5..139bf0d6f 100644
--- a/css/light-grey.css
+++ b/css/light-grey.css
@@ -107,6 +107,78 @@ table.listResults td {
}
+table.listResults td .view-image {
+ width: inherit !important;
+ height: inherit !important;
+}
+
+table.listResults td .view-image img {
+ max-width: 48px !important;
+ max-height: 48px !important;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+}
+
+
+.edit-image .view-image {
+ display: inline-block;
+}
+.edit-image .view-image.dirty.compat {
+ background-image: url("ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png");
+}
+.edit-image .view-image.dirty.compat img {
+ opacity: 0.3;
+}
+
+.edit-image .edit-buttons {
+ display: inline-block;
+ vertical-align: top;
+ margin-top: 4px;
+ margin-left: 3px;
+}
+.edit-image .edit-buttons .button {
+ cursor: pointer;
+ margin-bottom: 3px;
+ padding: 2px;
+ background-color: #e87c1e;
+}
+.edit-image .edit-buttons .button.disabled {
+ cursor: default;
+ background-color: #555555;
+ opacity: 0.3;
+}
+.edit-image .edit-buttons .button .ui-icon {
+ background-image: url("ui-lightness/images/ui-icons_ffffff_256x240.png");
+}
+
+.edit-image .file-input {
+ display: block;
+}
+
+
+/*
+ * Center the image both horizontally and vertically, withing a box which size is fixed (depends on the attribute definition)
+ */
+.details .view-image {
+ text-align: center;
+ padding: 2px;
+ border: 2px solid #dddddd;
+ border-radius: 6px;
+}
+
+.details .view-image img {
+ display: inline-block;
+ vertical-align: middle;
+}
+
+.details .view-image .helper-middle {
+ display: inline-block;
+ height: 100%;
+ vertical-align: middle;
+}
+
+
table.listContainer {
border: 0;
padding: 0;
@@ -2057,6 +2129,22 @@ table.export_parameters td {
}
+/*
+ * Format for the PDF output
+ */
+.table_preview .view-image {
+ width: inherit !important;
+ height: inherit !important;
+ text-align: center;
+}
+
+.table_preview .view-image img {
+ max-width: 48px !important;
+ max-height: 48px !important;
+ display: inline-block;
+}
+
+
.graph_zoom {
display: inline-block;
float: right;
diff --git a/css/light-grey.scss b/css/light-grey.scss
index 318a8fd4e..6bce87ce6 100644
--- a/css/light-grey.scss
+++ b/css/light-grey.scss
@@ -90,6 +90,83 @@ table.listResults td {
padding: 2px;
}
+table.listResults td .view-image {
+ // Counteract the forced dimensions (usefull for displaying in the details view)
+ width: inherit !important;
+ height: inherit !important;
+ img {
+ max-width: 48px !important;
+ max-height: 48px !important;
+ display: block;
+ margin-left: auto;
+ margin-right: auto;
+ }
+}
+
+.edit-image {
+ .view-image {
+ display: inline-block;
+
+ &.dirty {
+ // The image will be modified when saving the changes
+
+ &.compat {
+ // Browser not supporting FileReader
+ background-image: url("ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png");
+ img {
+ opacity: 0.3;
+ }
+ }
+ }
+ }
+
+ .edit-buttons {
+ display: inline-block;
+ vertical-align: top;
+ margin-top: 4px;
+ margin-left: 3px;
+
+ .button {
+ cursor: pointer;
+ margin-bottom: 3px;
+ padding: 2px;
+ background-color: $highlight-color;
+
+ &.disabled {
+ cursor: default;
+ background-color: $grey-color;
+ opacity: 0.3;
+ }
+ .ui-icon {
+ background-image: url("ui-lightness/images/ui-icons_ffffff_256x240.png");
+ }
+ }
+ }
+
+ .file-input {
+ display: block;
+ }
+}
+
+/* Center the image both horizontally and vertically, withing a box which size is fixed (depends on the attribute definition) */
+.details .view-image {
+ text-align: center;
+ padding: 2px;
+ border: 2px solid #DDDDDD;
+ border-radius: 6px;
+
+ img {
+ display: inline-block;
+ vertical-align: middle;
+ }
+ .helper-middle {
+ // Helper to center the image (requires a span dedicated to this)
+ display: inline-block;
+ height: 100%;
+ vertical-align: middle;
+ }
+}
+
table.listContainer {
border: 0;
padding: 0;
@@ -1520,6 +1597,18 @@ table.export_parameters td {
.table_preview div.text-preview {
white-space: pre-wrap;
}
+/* Format for the PDF output */
+.table_preview .view-image {
+ // Counteract the forced dimensions (usefull for displaying in the details view)
+ width: inherit !important;
+ height: inherit !important;
+ text-align: center;
+ img {
+ max-width: 48px !important;
+ max-height: 48px !important;
+ display: inline-block;
+ }
+}
.graph_zoom {
display: inline-block;
float: right;
@@ -1585,10 +1674,10 @@ span.refresh-button {
display: block;
}
.case-log-history-entry-end {
- display: none;
+ display: none;
}
.expanded .case-log-history-entry-end {
- display: inline;
+ display: inline;
}
.case-log-history-entry-more {
display: inline;
@@ -1603,7 +1692,7 @@ span.refresh-button {
vertical-align: bottom;
}
.printable-tab .case-log-history-entry-end {
- display: inline;
+ display: inline;
}
.printable-tab .case-log-history-entry-more {
display: none;
@@ -1776,4 +1865,4 @@ span.refresh-button {
}
.mfp-close {
cursor: pointer !important;
-}
\ No newline at end of file
+}
diff --git a/datamodels/2.x/itop-config-mgmt/data.sample.persons.xml b/datamodels/2.x/itop-config-mgmt/data.sample.persons.xml
index 009a56d95..30829d4a7 100755
--- a/datamodels/2.x/itop-config-mgmt/data.sample.persons.xml
+++ b/datamodels/2.x/itop-config-mgmt/data.sample.persons.xml
@@ -13,6 +13,7 @@
';
+ sMarkup += '';
+ sMarkup += '
';
+ sMarkup += '
';
+ sMarkup += '';
+
+ sMarkup += '';
+ sMarkup += '';
+
+ this.element
+ .addClass('edit-image')
+ .append(sMarkup);
+
+ $('#file_' + me.options.input_name).change(function () {
+
+ $('#do_remove_' + me.options.input_name).val('0');
+
+ me.previewImage(this, '#preview_' + me.options.input_name + ' img');
+
+ var oImage = $('#preview_' + me.options.input_name + ' img');
+ oImage.closest('.view-image').addClass('dirty');
+
+ $('#reset_' + me.options.input_name).removeClass('disabled');
+ $('#remove_' + me.options.input_name).removeClass('disabled');
+ });
+ $('#reset_' + me.options.input_name).click(function () {
+
+ if ($(this).hasClass('disabled')) return;
+
+ $('#do_remove_' + me.options.input_name).val('0');
+
+ // Restore the image
+ var oImage = $('#preview_' + me.options.input_name + ' img');
+ oImage.attr('src', oImage.attr('data-original-src'));
+ oImage.closest('.view-image').removeClass('dirty').removeClass('compat');
+
+ // Reset the file input without losing events bound to it
+ var oInput = $('#file_' + me.options.input_name);
+ oInput.replaceWith(oInput.val('').clone(true));
+
+ $('#reset_' + me.options.input_name).addClass('disabled');
+ var oRemoveBtn = $('#remove_' + me.options.input_name);
+ if (oRemoveBtn.attr('data-loaded-disabled') == 'yes') {
+ oRemoveBtn.addClass('disabled');
+ }
+ else {
+ oRemoveBtn.removeClass('disabled');
+ }
+ });
+ $('#remove_' + me.options.input_name).click(function () {
+
+ if ($(this).hasClass('disabled')) return;
+
+ $('#do_remove_' + me.options.input_name).val('1');
+
+ // Restore the default image
+ var oImage = $('#preview_' + me.options.input_name + ' img');
+ oImage.attr('src', oImage.attr('data-default-src'));
+ oImage.closest('.view-image')
+ .removeClass('compat')
+ .addClass('dirty');
+
+ // Reset the file input without losing events bound to it
+ var oInput = $('#file_' + me.options.input_name);
+ oInput.replaceWith(oInput.val('').clone(true));
+
+ var oRemoveBtn = $('#remove_' + me.options.input_name);
+ if (oRemoveBtn.attr('data-loaded-disabled') == 'yes') {
+ $('#reset_' + me.options.input_name).addClass('disabled');
+ }
+ else {
+ $('#reset_' + me.options.input_name).removeClass('disabled');
+ }
+ oRemoveBtn.addClass('disabled');
+ });
+ },
+ // called when created, and later when changing options
+ _refresh: function () {
+ },
+ // events bound via _bind are removed automatically
+ // revert other modifications here
+ _destroy: function () {
+ this.element.removeClass('edit-image');
+ },
+ // _setOptions is called with a hash of all options that are changing
+ _setOptions: function () {
+ this._superApply(arguments);
+ },
+ // _setOption is called for each individual option that is changing
+ _setOption: function (key, value) {
+ this._superApply(arguments);
+ },
+ previewImage: function (input, sImageSelector) {
+ if (input.files && input.files[0]) {
+ if (window.FileReader) {
+ var reader = new FileReader();
+
+ reader.onload = function (e) {
+ $(sImageSelector).attr('src', e.target.result);
+ }
+
+ reader.readAsDataURL(input.files[0]);
+ }
+ else {
+ $(sImageSelector).closest('.view-image').addClass('compat');
+ }
+ }
+ else {
+ $(sImageSelector).closest('.view-image').addClass('compat');
+ }
+ }
+ });
+});
diff --git a/setup/compiler.class.inc.php b/setup/compiler.class.inc.php
index c3deb8218..1101dbeea 100644
--- a/setup/compiler.class.inc.php
+++ b/setup/compiler.class.inc.php
@@ -1158,6 +1158,20 @@ EOF
$aParameters['is_null_allowed'] = $this->GetPropBoolean($oField, 'is_null_allowed', false);
$aParameters['depends_on'] = $sDependencies;
}
+ elseif ($sAttType == 'AttributeImage')
+ {
+ $aParameters['is_null_allowed'] = $this->GetPropBoolean($oField, 'is_null_allowed', false);
+ $aParameters['depends_on'] = $sDependencies;
+ $aParameters['display_max_width'] = $this->GetPropNumber($oField, 'display_max_width', 128);
+ $aParameters['display_max_height'] = $this->GetPropNumber($oField, 'display_max_height', 128);
+ $aParameters['storage_max_width'] = $this->GetPropNumber($oField, 'storage_max_width', 256);
+ $aParameters['storage_max_height'] = $this->GetPropNumber($oField, 'storage_max_height', 256);
+
+ if (($sDefault = $oField->GetChildText('default_image')) && (strlen($sDefault) > 0))
+ {
+ $aParameters['default_image'] = "utils::GetAbsoluteUrlModulesRoot().'$sModuleRelativeDir/$sDefault'";
+ }
+ }
elseif ($sAttType == 'AttributeStopWatch')
{
$oStates = $oField->GetUniqueElement('states');