diff --git a/plugins/yetiforce/preview.css b/plugins/yetiforce/preview.css index 69bf4b58..f4345966 100644 --- a/plugins/yetiforce/preview.css +++ b/plugins/yetiforce/preview.css @@ -1 +1,132 @@ -.pull-right{float:right !important}#ytActionBarContent select{padding:0}#ytActionBarContent .col{padding-left:4px}#ytActionBarContent .col-3{width:25%;min-height:1px;float:left;position:relative}#ytActionBarContent .row:before{display:table;content:" "}#ytActionBarContent .row:after{clear:both;display:table;content:" "}#ytActionBarContent .ytHeader{position:relative;border-bottom:1px solid #69a3cb}#ytActionBarContent .head{color:#fff;background-color:#4979aa;height:20px;padding-top:2px}#ytActionBarContent .data{color:#000;background:#ecf6ff}#ytActionBarContent .rowReletedRecord .rowActions{display:none}#ytActionBarContent .rowReletedRecord:hover .rowActions{display:block}#ytActionBarContent .noRecords{background:#70a8cb;text-align:center;color:#fff;padding:2px 0}#ytActionBarContent .noRecords a.importMail{color:#ecf6ff;cursor:pointer;font-weight:800}#ytActionBarContent .rowReletedRecord{margin:3px 0 6px 0}#ytActionBarContent .rowReletedRecord{margin:3px 0 6px 0}#ytActionBarContent .pull-right button{line-height:11px;margin-left:3px;padding:0 6px;height:14px}#ytActionBarContent .head .pull-right button{height:18px}#ytActionBarContent .pull-right button .glyphicon{top:0}#ytActionBarContent .data a{text-decoration:none;color:#000;font-size:14px;line-height:14px}#ytActionBarContent .relatedModuleIcon{margin-right:5px} \ No newline at end of file +.pull-right { + float: right !important +} + +#ytActionBarContent select { + padding: 0 +} + +#ytActionBarContent .row:before { + display: table; + content: " " +} + +#ytActionBarContent .row:after { + clear: both; + display: table; + content: " " +} + +#ytActionBarContent .ytHeader { + position: relative; + border-bottom: 1px solid #dfdfdf; +} + +#ytActionBarContent .rowReletedRecord .rowActions { + display: none +} + +#ytActionBarContent .rowReletedRecord:hover .rowActions { + display: block +} + +#ytActionBarContent .noRecords { + background: #70a8cb; + text-align: center; + color: #fff; + padding: 2px 0 +} + +#ytActionBarContent .noRecords a.importMail { + color: #ecf6ff; + cursor: pointer; + font-weight: 800 +} + +#ytActionBarContent .rowReletedRecord { + margin: 3px 0 6px 0 +} + +#ytActionBarContent .rowReletedRecord { + margin: 3px 0 6px 0 +} + +#ytActionBarContent .pull-right button { + line-height: 10px; + margin-left: 3px; + padding: 0 6px; + height: 14px +} + +#ytActionBarContent .relatedModuleIcon { + margin-right: 5px +} + +#messageheader.previewheader { + padding: 0 0 3px 30px; +} + +.rcmaddcontact { + display: none; +} + +.mr-5px { + margin-right: 5px; +} + +.ml-5px { + margin-left: 5px; +} + +.w-100 { + width: 100%; +} + +.flex-wrap { + display: flex; + flex-wrap: wrap; +} + +.rowRelatedRecord { + padding: 2px; +} + +.action-bar__head__container { + display: flex; + flex-wrap: nowrap; +} + +.action-bar__data a { + text-decoration: none; + color: #000; + font-size: 14px; + line-height: 14px +} + +.action-bar__header { + font-size: 14px; + min-width: 90px; +} + +.action-bar__head { + background-color: #4a5364; + height: 20px; + color: #fff; + padding: 2px; +} + +.action-bar__col { + width: 100%; +} + +@media only screen and (min-width: 600px) { + #ytActionBarContent .action-bar__col { + width: 50%; + } +} + +@media only screen and (min-width: 1200px) { + #ytActionBarContent .action-bar__col { + width: 25%; + } +} diff --git a/plugins/yetiforce/preview.js b/plugins/yetiforce/preview.js index 9d934fbb..bde82cf7 100644 --- a/plugins/yetiforce/preview.js +++ b/plugins/yetiforce/preview.js @@ -47,7 +47,7 @@ function registerEvents(content) { registerRemoveRecord(content); registerImportMail(content); - var block = content.find('.ytHeader .data'); + var block = content.find('.ytHeader .js-data'); content.find('.hideBtn').click(function () { var button = $(this); var icon = button.find('.glyphicon'); @@ -102,7 +102,7 @@ function registerSelectRecord(content) { mailId: id }; if ($(this).data('type') == 0) { - var module = $(this).closest('.col').find('.module').val(); + var module = $(this).closest('.js-head-container').find('.module').val(); } else { var module = $(this).data('module'); relParams.crmid = $(this).closest('.rowRelatedRecord').data('id'); @@ -130,7 +130,7 @@ function registerAddReletedRecord(content) { function registerAddRecord(content) { var id = content.find('#mailActionBarID').val(); content.find('button.addRecord').click(function (e) { - var col = $(e.currentTarget).closest('.col'); + var col = $(e.currentTarget).closest('.js-head-container'); showQuickCreateForm(col.find('.module').val(), id); }); } @@ -272,12 +272,14 @@ function showQuickCreateForm(moduleName, record, params) { } function getCrmWindow() { - if (opener !== null) { + if (opener !== null && opener.parent.CONFIG == "object") { return opener.parent; - } else if (typeof parent.app == "object") { + } else if (typeof parent.CONFIG == "object") { return parent; - } else if (typeof parent.parent.app == "object") { + } else if (typeof parent.parent.CONFIG == "object") { return parent.parent; + } else if (typeof opener.crm.CONFIG == "object") { + return opener.crm; } return false; } diff --git a/plugins/yetiforce/preview.min.css b/plugins/yetiforce/preview.min.css index 2d620f83..f4345966 100644 --- a/plugins/yetiforce/preview.min.css +++ b/plugins/yetiforce/preview.min.css @@ -1,82 +1,132 @@ -.pull-right{ - float: right!important; +.pull-right { + float: right !important } -#ytActionBarContent select{ - padding: 0; + +#ytActionBarContent select { + padding: 0 } -#ytActionBarContent .col{ - padding-left: 4px; -} -#ytActionBarContent .col-3{ - width: 25%; - min-height: 1px; - float: left; - position: relative; -} -#ytActionBarContent .row:before{ + +#ytActionBarContent .row:before { display: table; - content: " "; + content: " " } + #ytActionBarContent .row:after { - clear: both; + clear: both; display: table; - content: " "; + content: " " } -#ytActionBarContent .ytHeader{ + +#ytActionBarContent .ytHeader { position: relative; - border-bottom: 1px solid #69a3cb; + border-bottom: 1px solid #dfdfdf; } -#ytActionBarContent .head{ - color: #fff; - background-color: #4979aa; - height: 20px; - padding-top: 2px; + +#ytActionBarContent .rowReletedRecord .rowActions { + display: none } -#ytActionBarContent .data{ - color: #000; - background: #ecf6ff; + +#ytActionBarContent .rowReletedRecord:hover .rowActions { + display: block } -#ytActionBarContent .rowReletedRecord .rowActions{ - display: none; -} -#ytActionBarContent .rowReletedRecord:hover .rowActions{ - display: block; -} -#ytActionBarContent .noRecords{ + +#ytActionBarContent .noRecords { background: #70a8cb; text-align: center; color: #fff; - padding: 2px 0px; + padding: 2px 0 } -#ytActionBarContent .noRecords a.importMail{ + +#ytActionBarContent .noRecords a.importMail { color: #ecf6ff; cursor: pointer; - font-weight: 800; + font-weight: 800 } -#ytActionBarContent .rowReletedRecord{ - margin: 3px 0 6px 0; + +#ytActionBarContent .rowReletedRecord { + margin: 3px 0 6px 0 } -#ytActionBarContent .rowReletedRecord{ - margin: 3px 0 6px 0; + +#ytActionBarContent .rowReletedRecord { + margin: 3px 0 6px 0 } -#ytActionBarContent .pull-right button{ - line-height: 11px; + +#ytActionBarContent .pull-right button { + line-height: 10px; margin-left: 3px; - padding: 0px 6px; - height: 14px; + padding: 0 6px; + height: 14px +} + +#ytActionBarContent .relatedModuleIcon { + margin-right: 5px +} + +#messageheader.previewheader { + padding: 0 0 3px 30px; } -#ytActionBarContent .head .pull-right button{ - height: 18px; + +.rcmaddcontact { + display: none; +} + +.mr-5px { + margin-right: 5px; +} + +.ml-5px { + margin-left: 5px; +} + +.w-100 { + width: 100%; +} + +.flex-wrap { + display: flex; + flex-wrap: wrap; } -#ytActionBarContent .pull-right button .glyphicon{ - top: 0; + +.rowRelatedRecord { + padding: 2px; } -#ytActionBarContent .data a{ + +.action-bar__head__container { + display: flex; + flex-wrap: nowrap; +} + +.action-bar__data a { text-decoration: none; color: #000; - font-size: 14px; - line-height: 14px; + font-size: 14px; + line-height: 14px } -#ytActionBarContent .relatedModuleIcon{ - margin-right: 5px; + +.action-bar__header { + font-size: 14px; + min-width: 90px; +} + +.action-bar__head { + background-color: #4a5364; + height: 20px; + color: #fff; + padding: 2px; +} + +.action-bar__col { + width: 100%; +} + +@media only screen and (min-width: 600px) { + #ytActionBarContent .action-bar__col { + width: 50%; + } +} + +@media only screen and (min-width: 1200px) { + #ytActionBarContent .action-bar__col { + width: 25%; + } } diff --git a/skins/yetiforce/includes/links.html b/skins/yetiforce/includes/links.html index 677b0d5d..c28599b7 100644 --- a/skins/yetiforce/includes/links.html +++ b/skins/yetiforce/includes/links.html @@ -5,7 +5,6 @@ .css" /> - diff --git a/skins/yetiforce/templates/mail.html b/skins/yetiforce/templates/mail.html index 9d02cf6d..b41c6791 100644 --- a/skins/yetiforce/templates/mail.html +++ b/skins/yetiforce/templates/mail.html @@ -4,20 +4,11 @@ <roundcube:object name="pagetitle" /> @@ -34,6 +25,7 @@

+
@@ -95,14 +87,9 @@

-
- +
- - - +
@@ -154,24 +141,13 @@

- -
- - -   - - - -
-
- -