From 70dbe00f4d94fb95a50f578ecb7b39ce95597f38 Mon Sep 17 00:00:00 2001 From: Guillaume Lajarige Date: Wed, 31 Aug 2016 16:00:42 +0000 Subject: [PATCH] (Retrofit from trunk) Portal : IE9 fixes - Remaining console.log() inthe field_set.js file - Missing zoom-in / zoom-out mouse cursors on a object images (They are actually not available on IE9, so I put a pointing hand instead) - Missing pointer cursors on CaseLog field collapsers SVN:2.3[4363] --- .../itop-portal-base/portal/web/css/portal.css | 14 ++++++++++++++ .../itop-portal-base/portal/web/css/portal.scss | 15 +++++++++++++++ js/field_set.js | 5 ++++- 3 files changed, 33 insertions(+), 1 deletion(-) diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css index 68c71378e2..15dd7a1338 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.css +++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.css @@ -267,6 +267,10 @@ footer { .mfp-wrap { z-index: 1210; } +.mfp-img { + cursor: pointer; + cursor: zoom-out; +} /********************/ /* Typeahed setting */ /********************/ @@ -602,6 +606,11 @@ table .group-actions { color: #ea7d1e; font-size: 0.9em; } +/* InlineImage */ +.inline-image { + cursor: pointer; + cursor: zoom-in; +} /* CaseLog field */ .caselog_field_entry { border: 1px solid #ddd; @@ -622,6 +631,7 @@ table .group-actions { font-size: 16px; border: 1px solid #a6a6a6; border-bottom-color: #979797; + cursor: pointer; } .caselog_field_entry_button:hover { background-color: #ccc; @@ -886,6 +896,10 @@ table .group-actions { border-color: #fbeed5; color: #c09853; } +/* CKEditor : Misc */ +.cke_toolbox_collapser, .cke_toolbox_collapser .cke_arrow { + cursor: pointer !important; +} /* DataTables : Selection inputs */ .dataTable.table th span.row_input, .dataTable.table td span.row_input { display: inline-block; diff --git a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss index f0e4a12f61..a365a09112 100644 --- a/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss +++ b/datamodels/2.x/itop-portal-base/portal/web/css/portal.scss @@ -282,6 +282,10 @@ footer{ .mfp-wrap{ z-index: 1210; } +.mfp-img{ + cursor: pointer; + cursor: zoom-out; +} /********************/ /* Typeahed setting */ @@ -640,6 +644,11 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{ color: $brand-primary; font-size: 0.9em; } +/* InlineImage */ +.inline-image{ + cursor: pointer; + cursor: zoom-in; +} /* CaseLog field */ .caselog_field_entry{ border: 1px solid $gray-lighter; @@ -660,6 +669,7 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{ font-size: 16px; border: 1px solid #a6a6a6; border-bottom-color: #979797; + cursor: pointer; } .caselog_field_entry_button:hover{ background-color: #cccccc; @@ -928,6 +938,11 @@ table .group-actions .item-action-wrapper .panel-body > p:last-child{ border-color: $alert-warning-border; color: $alert-warning-text; } +/* CKEditor : Misc */ +.cke_toolbox_collapser, +.cke_toolbox_collapser .cke_arrow{ + cursor: pointer !important; +} /* DataTables : Selection inputs */ .dataTable.table th span.row_input, diff --git a/js/field_set.js b/js/field_set.js index d7144a6b03..02d1d899f7 100644 --- a/js/field_set.js +++ b/js/field_set.js @@ -131,7 +131,10 @@ $(function() } else { - console.log('Field set : Cannot retrieve current value from field [' + this.options.field_identifier_attr + '="' + oField.id + '"][data-form-path="' + this.options.form_path + '"] as it seems to have no itop.form_field widget attached.'); + if(window.console) + { + console.log('Field set : Cannot retrieve current value from field [' + this.options.field_identifier_attr + '="' + oField.id + '"][data-form-path="' + this.options.form_path + '"] as it seems to have no itop.form_field widget attached.'); + } } }