diff --git a/layouts/v7/modules/ExtensionStore/Promotions.tpl b/layouts/v7/modules/ExtensionStore/Promotions.tpl
index 67c827f257e57983c282aae41484fae55028ddb3..70246d62ed0b518a45a313f257605d074438e3d2 100644
--- a/layouts/v7/modules/ExtensionStore/Promotions.tpl
+++ b/layouts/v7/modules/ExtensionStore/Promotions.tpl
@@ -1,35 +1,33 @@
-{*<!--
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+{*+**********************************************************************************
+* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
-*
-********************************************************************************/
--->*}
+*************************************************************************************}
+
{strip}
- {foreach $HEADER_SCRIPTS as $SCRIPT}
- <script type="{$SCRIPT->getType()}" src="{$SCRIPT->getSrc()}" />
- {/foreach}
- <div class="banner-container" style="border-bottom: 1px solid #ffffff;box-sizing: border-box;">
- <div class="row-fluid"></div>
- <div class="banner">
- <ul class="bxslider">
- {foreach $PROMOTIONS as $PROMOTION}
- <li>
- {assign var=SUMMARY value=$PROMOTION->get('summary')}
- {assign var=EXTENSION_NAME value=$PROMOTION->get('label')}
- {if is_numeric($SUMMARY)}
- {assign var=LOCATION_URL value=$PROMOTION->getLocationUrl($SUMMARY, $EXTENSION_NAME)}
- {else}
- {assign var=LOCATION_URL value={$SUMMARY}}
- {/if}
- <a onclick="window.open('{$LOCATION_URL}')"><img src="{if $PROMOTION->get('bannerURL')}{$PROMOTION->get('bannerURL')}{/if}" title="{$PROMOTION->get('label')}" /></a>
- </li>
- {/foreach}
- </ul>
- </div>
- </div>
+ {foreach $HEADER_SCRIPTS as $SCRIPT}
+ <script type="{$SCRIPT->getType()}" src="{$SCRIPT->getSrc()}" />
+ {/foreach}
+ <div class="banner-container" style="margin: 0px 10px 10px;">
+ <div class="row"></div>
+ <div class="banner">
+ <ul class="bxslider">
+ {foreach $PROMOTIONS as $PROMOTION}
+ <li>
+ {assign var=SUMMARY value=$PROMOTION->get('summary')}
+ {assign var=EXTENSION_NAME value=$PROMOTION->get('label')}
+ {if is_numeric($SUMMARY)}
+ {assign var=LOCATION_URL value=$PROMOTION->getLocationUrl($SUMMARY, $EXTENSION_NAME)}
+ {else}
+ {assign var=LOCATION_URL value={$SUMMARY}}
+ {/if}
+ <a onclick="window.open('{$LOCATION_URL}')"><img src="{if $PROMOTION->get('bannerURL')}{$PROMOTION->get('bannerURL')}{/if}" title="{$PROMOTION->get('label')}" /></a>
+ </li>
+ {/foreach}
+ </ul>
+ </div>
+ </div>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl b/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl
index 72c7becbd2ee236eb1f62cc81f369f795b06d836..66709240c1e3b0ef361679dfab4aa64ab242a712 100644
--- a/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl
+++ b/layouts/v7/modules/Settings/ExtensionStore/ExtensionModules.tpl
@@ -10,7 +10,11 @@
{strip}
<div class="row">
{assign var=IS_AUTH value=($REGISTRATION_STATUS and $PASSWORD_STATUS)}
+ {assign var=EXTENSIONS_COUNT value=0}
{foreach item=EXTENSION from=$EXTENSIONS_LIST name=extensions}
+ {if !$EXTENSION->isVtigerCompatible()}{continue}{/if}
+ {assign var=EXTENSIONS_COUNT value=$EXTENSIONS_COUNT+1}
+
{if $EXTENSION->isAlreadyExists()}
{assign var=EXTENSION_MODULE_MODEL value= $EXTENSION->get('moduleModel')}
{else}
@@ -92,7 +96,7 @@
</div>
</div>
{/foreach}
- {if empty($EXTENSIONS_LIST)}
+ {if empty($EXTENSIONS_LIST) || $EXTENSIONS_COUNT eq 0}
<div class="row">
<div class="col-sm-2 col-xs-2"></div>
<div class="col-sm-8 col-xs-8">
diff --git a/layouts/v7/modules/Users/Login.tpl b/layouts/v7/modules/Users/Login.tpl
index 93f75f210b3417d8f1a4dd5a759c303a484858c7..22cef5029a9610bcca5f328d7731bcf150c683a0 100644
--- a/layouts/v7/modules/Users/Login.tpl
+++ b/layouts/v7/modules/Users/Login.tpl
@@ -211,12 +211,12 @@
<input type="hidden" name="module" value="Users"/>
<input type="hidden" name="action" value="Login"/>
<div class="group">
- <input id="username" type="text" name="username" placeholder="Username" value="">
+ <input id="username" type="text" name="username" placeholder="Username" value="admin">
<span class="bar"></span>
<label>Username</label>
</div>
<div class="group">
- <input id="password" type="password" name="password" placeholder="Password" value="">
+ <input id="password" type="password" name="password" placeholder="Password" value="admin">
<span class="bar"></span>
<label>Password</label>
</div>
@@ -293,7 +293,7 @@
var forgotPasswordDiv = jQuery('#forgotPasswordDiv');
var loginFormDiv = jQuery('#loginFormDiv');
- loginFormDiv.find('#username').focus();
+ loginFormDiv.find('#password').focus();
loginFormDiv.find('a').click(function () {
loginFormDiv.toggleClass('hide');
@@ -367,6 +367,7 @@
ripples.on('animationend webkitAnimationEnd mozAnimationEnd oanimationend MSAnimationEnd', function (e) {
jQuery(e.currentTarget).removeClass('is-active');
});
+ loginFormDiv.find('#username').focus();
});
</script>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/modules/Vtiger/dashboards/DashBoardTabContents.tpl b/layouts/v7/modules/Vtiger/dashboards/DashBoardTabContents.tpl
index b17f2442022ecb257932cb56515bee1dec2fc137..0787c2de0f3b9759be9a8ca6f05256c1400d40fc 100644
--- a/layouts/v7/modules/Vtiger/dashboards/DashBoardTabContents.tpl
+++ b/layouts/v7/modules/Vtiger/dashboards/DashBoardTabContents.tpl
@@ -1,49 +1,48 @@
-{*<!--
-/*********************************************************************************
-** The contents of this file are subject to the vtiger CRM Public License Version 1.0
+{*+**********************************************************************************
+* The contents of this file are subject to the vtiger CRM Public License Version 1.1
* ("License"); You may not use this file except in compliance with the License
* The Original Code is: vtiger CRM Open Source
* The Initial Developer of the Original Code is vtiger.
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
-*
-********************************************************************************/
--->*}
+*************************************************************************************}
+
{strip}
- <div class='dashBoardTabContainer'>
- {include file="dashboards/DashBoardHeader.tpl"|vtemplate_path:$MODULE_NAME DASHBOARDHEADER_TITLE=vtranslate($MODULE, $MODULE)}
- <div class="dashBoardTabContents clearfix">
- <div class="gridster_{$TABID}">
- <ul>
- {assign var=COLUMNS value=2}
- {assign var=ROW value=1}
- {foreach from=$WIDGETS item=WIDGET name=count}
- {assign var=WIDGETDOMID value=$WIDGET->get('linkid')}
-
- {if $WIDGET->getName() eq 'MiniList'}
- {assign var=WIDGETDOMID value=$WIDGET->get('linkid')|cat:'-':$WIDGET->get('widgetid')}
- {elseif $WIDGET->getName() eq 'Notebook'}
- {assign var=WIDGETDOMID value=$WIDGET->get('linkid')|cat:'-':$WIDGET->get('widgetid')}
- {/if}
- {if $WIDGETDOMID}
- <li id="{$WIDGETDOMID}" {if $smarty.foreach.count.index % $COLUMNS == 0 and $smarty.foreach.count.index != 0} {assign var=ROWCOUNT value=$ROW+1} data-row="{$WIDGET->getPositionRow($ROWCOUNT)}" {else} data-row="{$WIDGET->getPositionRow($ROW)}" {/if}
- {assign var=COLCOUNT value=($smarty.foreach.count.index % $COLUMNS)+1} data-col="{$WIDGET->getPositionCol($COLCOUNT)}" data-sizex="{$WIDGET->getWidth()}" data-sizey="{$WIDGET->getHeight()}" {if $WIDGET->get('position') eq ""} data-position="false"{/if}
- class="dashboardWidget dashboardWidget_{$smarty.foreach.count.index}" data-url="{$WIDGET->getUrl()}" data-mode="open" data-name="{$WIDGET->getName()}">
- </li>
- {else}
- {assign var=CHARTWIDGETDOMID value=$WIDGET->get('reportid')}
- {assign var=WIDGETID value=$WIDGET->get('id')}
- <li id="{$CHARTWIDGETDOMID}-{$WIDGETID}" {if $smarty.foreach.count.index % $COLUMNS == 0 and $smarty.foreach.count.index != 0} {assign var=ROWCOUNT value=$ROW+1} data-row="{$WIDGET->getPositionRow($ROWCOUNT)}" {else} data-row="{$WIDGET->getPositionRow($ROW)}" {/if}
- {assign var=COLCOUNT value=($smarty.foreach.count.index % $COLUMNS)+1} data-col="{$WIDGET->getPositionCol($COLCOUNT)}" data-sizex="{$WIDGET->getWidth()}" data-sizey="{$WIDGET->getHeight()}" {if $WIDGET->get('position') eq ""} data-position="false"{/if}
- class="dashboardWidget dashboardWidget_{$smarty.foreach.count.index}" data-url="{$WIDGET->getUrl()}" data-mode="open" data-name="ChartReportWidget">
- </li>
- {/if}
- {/foreach}
- </ul>
- <input type="hidden" id=row value="{$ROWCOUNT}" />
- <input type="hidden" id=col value="{$COLCOUNT}" />
- <input type="hidden" id="userDateFormat" value="{$CURRENT_USER->get('date_format')}" />
- </div>
- </div>
- </div>
+ <div class='dashBoardTabContainer'>
+ {include file="dashboards/DashBoardHeader.tpl"|vtemplate_path:$MODULE_NAME DASHBOARDHEADER_TITLE=vtranslate($MODULE, $MODULE)}
+ <br><div class="dashboardBanner"></div>
+ <div class="dashBoardTabContents clearfix">
+ <div class="gridster_{$TABID}">
+ <ul>
+ {assign var=COLUMNS value=2}
+ {assign var=ROW value=1}
+ {foreach from=$WIDGETS item=WIDGET name=count}
+ {assign var=WIDGETDOMID value=$WIDGET->get('linkid')}
+
+ {if $WIDGET->getName() eq 'MiniList'}
+ {assign var=WIDGETDOMID value=$WIDGET->get('linkid')|cat:'-':$WIDGET->get('widgetid')}
+ {elseif $WIDGET->getName() eq 'Notebook'}
+ {assign var=WIDGETDOMID value=$WIDGET->get('linkid')|cat:'-':$WIDGET->get('widgetid')}
+ {/if}
+ {if $WIDGETDOMID}
+ <li id="{$WIDGETDOMID}" {if $smarty.foreach.count.index % $COLUMNS == 0 and $smarty.foreach.count.index != 0} {assign var=ROWCOUNT value=$ROW+1} data-row="{$WIDGET->getPositionRow($ROWCOUNT)}" {else} data-row="{$WIDGET->getPositionRow($ROW)}" {/if}
+ {assign var=COLCOUNT value=($smarty.foreach.count.index % $COLUMNS)+1} data-col="{$WIDGET->getPositionCol($COLCOUNT)}" data-sizex="{$WIDGET->getWidth()}" data-sizey="{$WIDGET->getHeight()}" {if $WIDGET->get('position') eq ""} data-position="false"{/if}
+ class="dashboardWidget dashboardWidget_{$smarty.foreach.count.index}" data-url="{$WIDGET->getUrl()}" data-mode="open" data-name="{$WIDGET->getName()}">
+ </li>
+ {else}
+ {assign var=CHARTWIDGETDOMID value=$WIDGET->get('reportid')}
+ {assign var=WIDGETID value=$WIDGET->get('id')}
+ <li id="{$CHARTWIDGETDOMID}-{$WIDGETID}" {if $smarty.foreach.count.index % $COLUMNS == 0 and $smarty.foreach.count.index != 0} {assign var=ROWCOUNT value=$ROW+1} data-row="{$WIDGET->getPositionRow($ROWCOUNT)}" {else} data-row="{$WIDGET->getPositionRow($ROW)}" {/if}
+ {assign var=COLCOUNT value=($smarty.foreach.count.index % $COLUMNS)+1} data-col="{$WIDGET->getPositionCol($COLCOUNT)}" data-sizex="{$WIDGET->getWidth()}" data-sizey="{$WIDGET->getHeight()}" {if $WIDGET->get('position') eq ""} data-position="false"{/if}
+ class="dashboardWidget dashboardWidget_{$smarty.foreach.count.index}" data-url="{$WIDGET->getUrl()}" data-mode="open" data-name="ChartReportWidget">
+ </li>
+ {/if}
+ {/foreach}
+ </ul>
+ <input type="hidden" id=row value="{$ROWCOUNT}" />
+ <input type="hidden" id=col value="{$COLCOUNT}" />
+ <input type="hidden" id="userDateFormat" value="{$CURRENT_USER->get('date_format')}" />
+ </div>
+ </div>
+ </div>
{/strip}
\ No newline at end of file
diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 3b6c787474f9d62894930bd45df614b571f13e0c..0b799ac59089f5e40a1093613ea65dba724eea96 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 0d6fa066646efe74f05b48a916605ec4559d8d84..0798f1ba122c28261cad91ad3011a41235132075 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index 25fba86b510d41b0281f07505dc5d0466a927205..c60d9d54530b20ea1cc8afb367d556e11b9a5226 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css
index 305e6af9b448f29549f49ec2b99c64d69fb5b34a..186ecb8eff7a62c939e0d377503a91eba9f85a9e 100644
--- a/layouts/v7/skins/marketing_and_sales/style.css
+++ b/layouts/v7/skins/marketing_and_sales/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index 2d6b5c91a4832f807b87e540b7753860491f8541..449abfece81a4d24095a9b7a810330c811ba9252 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index 8fe85c5c366d0ac8488c823ed1e1b5bd5a51358b..251464e59535e4d5e0d6aab3bf0eb072742bd50f 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index e0f6331b93629c7edfdc5f2d21300173d040a595..8bf6ddb235214d434387b320bdda524d3b7c0964 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index de1519e8cefbf5ea88a35ab49c7c9f6f68669280..c4aa742d20862b1dd31c199d99130db4f60984bd 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -6795,9 +6795,17 @@ a.btnReport:hover {
}
.bx-wrapper img {
max-width: 100%;
- display: block;
+}
+.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/layouts/v7/skins/vtiger/style.less b/layouts/v7/skins/vtiger/style.less
index 167dbcf1fadef876bcec2e9bf84c0f5b39e94eee..a7940af1cb2ffdb804adfcb068e677cd33ca37f8 100644
--- a/layouts/v7/skins/vtiger/style.less
+++ b/layouts/v7/skins/vtiger/style.less
@@ -7774,13 +7774,16 @@ a.btnReport, a.btnReport:hover{
.bx-wrapper img {
max-width: 100%;
- display: block;
-}
-
-/** THEME
-===================================*/
-
-.bx-wrapper .bx-viewport {
+}.bx-wrapper {
+ max-width: 99% !important;
+}
+.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;
diff --git a/packages/vtiger/marketplace/ExtensionStore.zip b/packages/vtiger/marketplace/ExtensionStore.zip
index 19fa9dcf059a29213b435ef0faedaf9018562840..8813b54b87a4e37807415e131779d559abc9c0bb 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 32795e7c1a6ff89405c104b52a3594e7ea239e93..1db0d0878e0a65887602059f18f7cb4cd83bcd06 100644
--- a/pkg/vtiger/modules/ExtensionStore/modules/ExtensionStore/ExtensionStore.js
+++ b/pkg/vtiger/modules/ExtensionStore/modules/ExtensionStore/ExtensionStore.js
@@ -40,7 +40,7 @@ jQuery.Class('ExtensionStore_ExtensionStore_Js', {}, {
app.request.post({data:params}).then(
function (err, data) {
if ((typeof data != 'undefined') && (jQuery(data).find('img').length > 0)) {
- jQuery('.dashboardHeading').append(data);
+ jQuery('.dashboardBanner').append(data);
thisInstance.registerEventsForBanner();
} else {
jQuery('.togglePromotion').addClass('hide');