diff --git a/layouts/v7/modules/ExtensionStore/Promotions.tpl b/layouts/v7/modules/ExtensionStore/Promotions.tpl
index 70246d62ed0b518a45a313f257605d074438e3d2..dd28c2e86a1ed2ce88bf535e2f2531dfd4864f0e 100644
--- a/layouts/v7/modules/ExtensionStore/Promotions.tpl
+++ b/layouts/v7/modules/ExtensionStore/Promotions.tpl
@@ -11,7 +11,7 @@
{foreach $HEADER_SCRIPTS as $SCRIPT}
<script type="{$SCRIPT->getType()}" src="{$SCRIPT->getSrc()}" />
{/foreach}
- <div class="banner-container" style="margin: 0px 10px 10px;">
+ <div class="banner-container" style="margin: 0px 10px;">
<div class="row"></div>
<div class="banner">
<ul class="bxslider">
diff --git a/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl b/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl
index 93294a18acb876c1466e4a90e179b30d10d9e59d..11737f390cd775c3b9c26c13df9c7dbf04c2dd17 100644
--- a/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl
+++ b/layouts/v7/modules/Vtiger/dashboards/DashBoardHeader.tpl
@@ -11,48 +11,50 @@
-->*}
<div class='dashboardHeading container-fluid'>
- <div class="btn-group pull-right">
- {if $SELECTABLE_WIDGETS|count gt 0}
- <button class='btn btn-default addButton dropdown-toggle' data-toggle='dropdown'>
- {vtranslate('LBL_ADD_WIDGET')} <i class="caret"></i>
- </button>
-
- <ul class="dropdown-menu dropdown-menu-right widgetsList pull-right" style="min-width:100%;text-align:left;">
- {assign var="MINILISTWIDGET" value=""}
- {foreach from=$SELECTABLE_WIDGETS item=WIDGET}
- {if $WIDGET->getName() eq 'MiniList'}
- {assign var="MINILISTWIDGET" value=$WIDGET} {* Defer to display as a separate group *}
- {elseif $WIDGET->getName() eq 'Notebook'}
- {assign var="NOTEBOOKWIDGET" value=$WIDGET} {* Defer to display as a separate group *}
- {else}
- <li>
- <a onclick="Vtiger_DashBoard_Js.addWidget(this, '{$WIDGET->getUrl()}')" href="javascript:void(0);"
- data-linkid="{$WIDGET->get('linkid')}" data-name="{$WIDGET->getName()}" data-width="{$WIDGET->getWidth()}" data-height="{$WIDGET->getHeight()}">
- {vtranslate($WIDGET->getTitle(), $MODULE_NAME)}</a>
- </li>
- {/if}
- {/foreach}
-
- {if $MINILISTWIDGET && $MODULE_NAME == 'Home'}
- <li class="divider"></li>
- <li>
- <a onclick="Vtiger_DashBoard_Js.addMiniListWidget(this, '{$MINILISTWIDGET->getUrl()}')" href="javascript:void(0);"
- data-linkid="{$MINILISTWIDGET->get('linkid')}" data-name="{$MINILISTWIDGET->getName()}" data-width="{$MINILISTWIDGET->getWidth()}" data-height="{$MINILISTWIDGET->getHeight()}">
- {vtranslate($MINILISTWIDGET->getTitle(), $MODULE_NAME)}</a>
- </li>
- <li>
- <a onclick="Vtiger_DashBoard_Js.addNoteBookWidget(this, '{$NOTEBOOKWIDGET->getUrl()}')" href="javascript:void(0);"
- data-linkid="{$NOTEBOOKWIDGET->get('linkid')}" data-name="{$NOTEBOOKWIDGET->getName()}" data-width="{$NOTEBOOKWIDGET->getWidth()}" data-height="{$NOTEBOOKWIDGET->getHeight()}">
- {vtranslate($NOTEBOOKWIDGET->getTitle(), $MODULE_NAME)}</a>
- </li>
- {/if}
-
- </ul>
- {else if $MODULE_PERMISSION}
- <button class='btn addButton dropdown-toggle' disabled="disabled" data-toggle='dropdown'>
- <strong>{vtranslate('LBL_ADD_WIDGET')}</strong>
- <i class="caret"></i>
- </button>
- {/if}
- </div>
+ <div class="buttonGroups pull-right">
+ <div class="btn-group">
+ {if $SELECTABLE_WIDGETS|count gt 0}
+ <button class='btn btn-default addButton dropdown-toggle' data-toggle='dropdown'>
+ {vtranslate('LBL_ADD_WIDGET')} <i class="caret"></i>
+ </button>
+
+ <ul class="dropdown-menu dropdown-menu-right widgetsList pull-right" style="min-width:100%;text-align:left;">
+ {assign var="MINILISTWIDGET" value=""}
+ {foreach from=$SELECTABLE_WIDGETS item=WIDGET}
+ {if $WIDGET->getName() eq 'MiniList'}
+ {assign var="MINILISTWIDGET" value=$WIDGET} {* Defer to display as a separate group *}
+ {elseif $WIDGET->getName() eq 'Notebook'}
+ {assign var="NOTEBOOKWIDGET" value=$WIDGET} {* Defer to display as a separate group *}
+ {else}
+ <li>
+ <a onclick="Vtiger_DashBoard_Js.addWidget(this, '{$WIDGET->getUrl()}')" href="javascript:void(0);"
+ data-linkid="{$WIDGET->get('linkid')}" data-name="{$WIDGET->getName()}" data-width="{$WIDGET->getWidth()}" data-height="{$WIDGET->getHeight()}">
+ {vtranslate($WIDGET->getTitle(), $MODULE_NAME)}</a>
+ </li>
+ {/if}
+ {/foreach}
+
+ {if $MINILISTWIDGET && $MODULE_NAME == 'Home'}
+ <li class="divider"></li>
+ <li>
+ <a onclick="Vtiger_DashBoard_Js.addMiniListWidget(this, '{$MINILISTWIDGET->getUrl()}')" href="javascript:void(0);"
+ data-linkid="{$MINILISTWIDGET->get('linkid')}" data-name="{$MINILISTWIDGET->getName()}" data-width="{$MINILISTWIDGET->getWidth()}" data-height="{$MINILISTWIDGET->getHeight()}">
+ {vtranslate($MINILISTWIDGET->getTitle(), $MODULE_NAME)}</a>
+ </li>
+ <li>
+ <a onclick="Vtiger_DashBoard_Js.addNoteBookWidget(this, '{$NOTEBOOKWIDGET->getUrl()}')" href="javascript:void(0);"
+ data-linkid="{$NOTEBOOKWIDGET->get('linkid')}" data-name="{$NOTEBOOKWIDGET->getName()}" data-width="{$NOTEBOOKWIDGET->getWidth()}" data-height="{$NOTEBOOKWIDGET->getHeight()}">
+ {vtranslate($NOTEBOOKWIDGET->getTitle(), $MODULE_NAME)}</a>
+ </li>
+ {/if}
+
+ </ul>
+ {else if $MODULE_PERMISSION}
+ <button class='btn addButton dropdown-toggle' disabled="disabled" data-toggle='dropdown'>
+ <strong>{vtranslate('LBL_ADD_WIDGET')}</strong>
+ <i class="caret"></i>
+ </button>
+ {/if}
+ </div>
+ </div>
</div>
diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 0b799ac59089f5e40a1093613ea65dba724eea96..fcae04216a06dbc4a32e5c0c2aa79a2e2f3b72e7 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 0798f1ba122c28261cad91ad3011a41235132075..118106d8854bf244822f331750a97be42d57eddb 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index c60d9d54530b20ea1cc8afb367d556e11b9a5226..7332f871837a1d782bda31ba74aae011872227ad 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css
index 186ecb8eff7a62c939e0d377503a91eba9f85a9e..f07eaabfcb855d9781e2a1a8b22bb42e12fe0102 100644
--- a/layouts/v7/skins/marketing_and_sales/style.css
+++ b/layouts/v7/skins/marketing_and_sales/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index 449abfece81a4d24095a9b7a810330c811ba9252..75699fa8e027b06f990dbcaf033be4942a54e2a1 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index 251464e59535e4d5e0d6aab3bf0eb072742bd50f..4131e8604a87babb580108e54a0c3dd761b12fe7 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index 8bf6ddb235214d434387b320bdda524d3b7c0964..666fef33377d6ff3dfbac0fb942e5c89fe06f0b3 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index c4aa742d20862b1dd31c199d99130db4f60984bd..d728210868e0203ac86287ad3c166d9120625bd3 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -6795,21 +6795,22 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
+ width: 500px;
+ height: 45px;
}
-.bx-wrapper {
- max-width: 99% !important;
+.bx-wrapper .bxslider {
+ padding-left: 0px;
+}
+.bxslider ul {
+ padding-left: 0px;
}
-.bxslider li {
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
.bx-wrapper .bx-viewport {
width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
left: 0px;
background: #fff;
-webkit-transform: translatez(0);
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index a7940af1cb2ffdb804adfcb068e677cd33ca37f8..2e602184a89c05f201ec5542448ce3dd424084a0 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -7766,7 +7766,6 @@ a.btnReport, a.btnReport:hover{
//Image Animation - Products - start
.bx-wrapper {
position: relative;
- //margin: 0 auto 10px;
margin-bottom: 10px;
padding: 0;
*zoom: 1;
@@ -7774,20 +7773,26 @@ a.btnReport, a.btnReport:hover{
.bx-wrapper img {
max-width: 100%;
-}.bx-wrapper {
- max-width: 99% !important;
+ width: 500px;
+ height: 45px;
+}
+
+.bx-wrapper .bxslider {
+ padding-left: 0px;
}
-.bxslider li {
+
+.bxslider ul {
+ padding-left: 0px;
+}
+
+.bx-wrapper .bxslider li {
position: relative;
text-align: center;
left: 0px;
}
+
.bx-wrapper .bx-viewport {
- width:99%;
- -moz-box-shadow: 0 0 5px #ccc;
- -webkit-box-shadow: 0 0 5px #ccc;
- box-shadow: 0 0 5px #ccc;
- border: 5px solid #fff;
+ width:99%;
left: 0px;
background: #fff;
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 8813b54b87a4e37807415e131779d559abc9c0bb..fdaeafd47acfc8da5b01bc224b916ca546f03bb7 100644
Binary files a/packages/vtiger/marketplace/ExtensionStore.zip and b/packages/vtiger/marketplace/ExtensionStore.zip differ
diff --git a/pkg/vtiger/modules/ExtensionStore/modules/ExtensionStore/ExtensionStore.js b/pkg/vtiger/modules/ExtensionStore/modules/ExtensionStore/ExtensionStore.js
index 1db0d0878e0a65887602059f18f7cb4cd83bcd06..2f6a8098330fae926c5cf96ec013c789acd1acc1 100644
--- a/pkg/vtiger/modules/ExtensionStore/modules/ExtensionStore/ExtensionStore.js
+++ b/pkg/vtiger/modules/ExtensionStore/modules/ExtensionStore/ExtensionStore.js
@@ -20,10 +20,7 @@ jQuery.Class('ExtensionStore_ExtensionStore_Js', {}, {
auto: true,
pager: items.length > 1,
speed: items.length > 1 ? 1500 : 0,
- pause: 3000,
- onSlideBefore: function () {
- jQuery('.bx-viewport').css({'height': '150px', 'overflow': 'hidden'});
- }
+ pause: 3000
});
}
},
@@ -87,29 +84,29 @@ jQuery.Class('ExtensionStore_ExtensionStore_Js', {}, {
if (element.hasClass('up')) {
bannerContainer.slideUp();
- element.find('.icon-chevron-up').addClass('hide');
- element.find('.icon-chevron-down').removeClass('hide');
+ element.find('.fa-chevron-up').addClass('hide');
+ element.find('.fa-chevron-down').removeClass('hide');
element.addClass('down').removeClass('up');
} else if (element.hasClass('down')) {
if (bannerContainer.find('img').length <= 0) {
thisInstance.getPromotionsFromMarketPlace(null);
}
bannerContainer.slideDown();
- element.find('.icon-chevron-down').addClass('hide');
- element.find('.icon-chevron-up').removeClass('hide');
+ element.find('.fa-chevron-down').addClass('hide');
+ element.find('.fa-chevron-up').removeClass('hide');
element.addClass('up').removeClass('down');
}
});
},
insertTogglePromotionHtml: function () {
- var toggleHtml = '<span class="btn-group">'+
- '<button class="btn addButton togglePromotion up">'+
- '<span id="hide" class="icon icon-chevron-up"></span>'+
- '<span id="show" class="icon icon-chevron-down hide"></span>'+
+ var toggleHtml = '<div class="btn-group">'+
+ '<button class="btn btn-default addButton togglePromotion up">'+
+ '<span id="hide" class="fa fa-chevron-up"></span>'+
+ '<span id="show" class="fa fa-chevron-down hide"></span>'+
'</button>'+
- '</span>';
- jQuery('.dashboardHeading').find('.btn-toolbar').append(toggleHtml);
+ '</div>';
+ jQuery('.dashboardHeading').find('.buttonGroups').append(toggleHtml);
},
registerEvents: function () {
@@ -119,10 +116,8 @@ jQuery.Class('ExtensionStore_ExtensionStore_Js', {}, {
if ((moduleName == 'Home')) {
thisInstance.insertTogglePromotionHtml();
thisInstance.getPromotionsFromMarketPlace();
- jQuery('.togglePromotion').find('.icon-chevron-up').addClass('hide');
- jQuery('.togglePromotion').find('.icon-chevron-down').removeClass('hide');
- jQuery('.togglePromotion').addClass('down').removeClass('up');
thisInstance.registerEventsForTogglePromotion();
+ jQuery('.togglePromotion').trigger('click');
}
}
});