diff --git a/layouts/v7/modules/Install/Step2.tpl b/layouts/v7/modules/Install/Step2.tpl
index 1211724ea55fd6f1aab6d39b8a76f8d30b41356a..dd7c5ae9b9541f42961268c89d5dbed8f79fdd50 100644
--- a/layouts/v7/modules/Install/Step2.tpl
+++ b/layouts/v7/modules/Install/Step2.tpl
@@ -224,7 +224,7 @@
<div class="row">
<div class="col-sm-12">
<div class="button-container">
- <input name="back" type="button" class="btn btn-large" value="{vtranslate('LBL_DISAGREE', 'Install')}"/>
+ <input name="back" type="button" class="btn btn-default" value="{vtranslate('LBL_DISAGREE', 'Install')}"/>
<input id="agree" type="submit" class="btn btn-large btn-primary" value="{vtranslate('LBL_I_AGREE', 'Install')}"/>
</div>
</div>
diff --git a/layouts/v7/modules/Install/Step3.tpl b/layouts/v7/modules/Install/Step3.tpl
index 830eb34df22e681f6d18d8dfeea296e90115f441..9afd1516a409ba4ea862c508de3aae2abcdd5e43 100644
--- a/layouts/v7/modules/Install/Step3.tpl
+++ b/layouts/v7/modules/Install/Step3.tpl
@@ -32,7 +32,7 @@
<div class=" pull-right">
<div class="button-container">
<a href ="#">
- <input type="button" class="btn" value="{vtranslate('LBL_RECHECK', 'Install')}" id='recheck'/>
+ <input type="button" class="btn btn-default" value="{vtranslate('LBL_RECHECK', 'Install')}" id='recheck'/>
</a>
</div>
</div>
@@ -103,7 +103,7 @@
<div class="col-sm-2"></div>
<div class="col-sm-8">
<div class="button-container">
- <input type="button" class="btn btn-large" value="{vtranslate('LBL_BACK', 'Install')}" name="back"/>
+ <input type="button" class="btn btn-default" value="{vtranslate('LBL_BACK', 'Install')}" name="back"/>
<input type="button" class="btn btn-large btn-primary" value="{vtranslate('LBL_NEXT', 'Install')}" name="step4"/>
</div>
</div>
diff --git a/layouts/v7/modules/Install/Step4.tpl b/layouts/v7/modules/Install/Step4.tpl
index aaec91255b6b7d21af7a84fbf85434ece86c761c..f358877d786088e4ab182ef530e6bc1e71a7c5e0 100644
--- a/layouts/v7/modules/Install/Step4.tpl
+++ b/layouts/v7/modules/Install/Step4.tpl
@@ -157,7 +157,7 @@
<div class="row">
<div class="col-sm-12">
<div class="button-container">
- <input type="button" class="btn btn-large" value="{vtranslate('LBL_BACK','Install')}" name="back"/>
+ <input type="button" class="btn btn-default" value="{vtranslate('LBL_BACK','Install')}" name="back"/>
<input type="button" class="btn btn-large btn-primary" value="{vtranslate('LBL_NEXT','Install')}" name="step5"/>
</div>
</div>
diff --git a/layouts/v7/modules/Install/Step5.tpl b/layouts/v7/modules/Install/Step5.tpl
index 92d88313a7786d722b6cdfc3df0164e0c6560b1a..a1df25808d87e0b04e008c4c63294a73d8010fed 100644
--- a/layouts/v7/modules/Install/Step5.tpl
+++ b/layouts/v7/modules/Install/Step5.tpl
@@ -99,7 +99,7 @@
<div class="col-sm-2"></div>
<div class="col-sm-8">
<div class="button-container">
- <input type="button" class="btn btn-large" value="{vtranslate('LBL_BACK','Install')}" {if $DB_CONNECTION_INFO['flag'] eq true} disabled= "disabled" {/if} name="back"/>
+ <input type="button" class="btn btn-default" value="{vtranslate('LBL_BACK','Install')}" {if $DB_CONNECTION_INFO['flag'] eq true} disabled= "disabled" {/if} name="back"/>
{if $DB_CONNECTION_INFO['flag'] eq true}
<input type="button" class="btn btn-large btn-primary" value="{vtranslate('LBL_NEXT','Install')}" name="step6"/>
{/if}
diff --git a/layouts/v7/modules/Vtiger/EmailPreview.tpl b/layouts/v7/modules/Vtiger/EmailPreview.tpl
index b4a132c4b5194ab1b197ddccaa80bb6a19f03d2f..04c027e9f7bf06a7451cfe4062d0426d613343ec 100644
--- a/layouts/v7/modules/Vtiger/EmailPreview.tpl
+++ b/layouts/v7/modules/Vtiger/EmailPreview.tpl
@@ -6,183 +6,180 @@
* Portions created by vtiger are Copyright (C) vtiger.
* All Rights Reserved.
************************************************************************************}
-{strip}
- <div class="SendEmailFormStep2 modal-dialog modal-lg" name="emailPreview">
- <div class="modal-content">
- <input type="hidden" name="parentRecord" value="{$PARENT_RECORD}"/>
- <input type="hidden" name="recordId" value="{$RECORD_ID}"/>
- <form class="form-horizontal" id="massEmailForm" method="post" action="index.php" enctype="multipart/form-data" name="massEmailForm">
- {assign var=HEADER_TITLE value={vtranslate('SINGLE_Emails', $MODULE)}|cat:" "|cat:{vtranslate('LBL_INFO', $MODULE)}}
- {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
- <div class="modal-body" id='emailPreviewScroll'>
- <div class="row">
- <div class="col-lg-6">
- <div class="row email-info-row">
- <span class="col-lg-12">
- <span class="col-lg-4">
- <span class="pull-right">{vtranslate('LBL_FROM',$MODULE)}</span>
- </span>
- <span class="col-lg-8">
- <span class="row-fluid">{$FROM}</span>
- </span>
- </span>
- </div>
- <div class="row email-info-row">
- <span class="col-lg-12">
- <span class="col-lg-4">
- <span class="pull-right">{vtranslate('LBL_TO',$MODULE)}</span>
- </span>
- <span class="col-lg-8">
- {if empty($TO)}
- {assign var=TO value=array()}
- {/if}
- {assign var=TO_EMAILS value=","|implode:$TO}
- <span class="row-fluid">
- <span class="col-sm-10 paddingLeft0"><p class="textOverflowEllipsis">{$TO_EMAILS}</p></span>
- {if $TO|@count > 1}
- <span class="col-sm-2">
- <a href="#" data-toggle="dropdown" style="text-transform: lowercase;">{vtranslate('LBL_MORE',$MODULE)}</a>
- <ul class="dropdown-menu" style="padding:3px 6px; max-height:200px;" id="toAddressesDropdown">
- {foreach item=TO_ADDRESS from=$TO}
- <li>{$TO_ADDRESS}</li>
- {/foreach}
- </ul>
- </span>
- {/if}
- </span>
- </span>
- </span>
- </div>
- </div>
- <div class="col-lg-6">
- <div class="email-preview-toolbar pull-right">
- {if $RECORD->getEmailFlag() neq 'SAVED'}
- <button type="button" name="previewReply" class="btn btn-sm" data-mode="emailReply">
- <strong>{vtranslate('LBL_REPLY',$MODULE)}</strong>
- </button>
- {if count($TO) > 1 || !empty($CC) || !empty($BCC)}
- <button type="button" name="previewReplyAll" class="btn btn-sm" data-mode="emailReplyAll">
- <strong>{vtranslate('LBL_REPLY_ALL',$MODULE)}</strong>
- </button>
- {/if}
- {/if}
- <button type="button" name="previewForward" class="btn btn-sm" data-mode="emailForward">
- <strong>{vtranslate('LBL_FORWARD',$MODULE)}</strong>
- </button>
- {if $RECORD->getEmailFlag() eq 'SAVED'}
- <button type="button" name="previewEdit" class="btn btn-sm" data-mode="emailEdit">
- <strong>{vtranslate('LBL_EDIT',$MODULE)}</strong>
- </button>
- {/if}
- <button type="button" name="previewPrint" class="btn btn-sm" data-mode="previewPrint">
- <strong>{vtranslate('LBL_PRINT',$MODULE)}</strong>
- </button>
- </div>
- </div>
- </div>
- <div class="row">
- <div class="col-lg-8">
- {if !empty($CC)}
- <div class="row email-info-row">
- <span class="col-lg-12">
- <span class="col-lg-3">
- <span class="pull-right">{vtranslate('LBL_CC',$MODULE)}</span>
- </span>
- <span class="col-lg-9">
- <span class="row-fluid">
- {$CC}
- </span>
- </span>
- </span>
- </div>
- {/if}
- {if !empty($BCC)}
- <div class="row hide email-info-row">
- <span class="col-lg-12">
- <span class="col-lg-3">
- <span class="pull-right">{vtranslate('LBL_BCC',$MODULE)}</span>
- </span>
- <span class="col-lg-9">
- <span class="row-fluid">
- {$BCC}
- </span>
- </span>
- </span>
- </div>
- {/if}
- <div class="row email-info-row">
- <span class="col-lg-12">
- <span class="col-lg-3">
- <span class="pull-right">{vtranslate('LBL_SUBJECT',$MODULE)}</span>
- </span>
- <span class="col-lg-9">
- {$RECORD->get('subject')}
- </span>
- </span>
- </div>
+{strip}
+ <div class="SendEmailFormStep2 modal-dialog modal-lg" name="emailPreview">
+ <div class="modal-content">
+ <input type="hidden" name="parentRecord" value="{$PARENT_RECORD}"/>
+ <input type="hidden" name="recordId" value="{$RECORD_ID}"/>
+ <form class="form-horizontal" id="massEmailForm" method="post" action="index.php" enctype="multipart/form-data" name="massEmailForm">
+ {assign var=HEADER_TITLE value={vtranslate('SINGLE_Emails', $MODULE)}|cat:" "|cat:{vtranslate('LBL_INFO', $MODULE)}}
+ {include file="ModalHeader.tpl"|vtemplate_path:$MODULE TITLE=$HEADER_TITLE}
+ <div class="modal-body" id='emailPreviewScroll'>
+ <div class="row">
+ <div class="col-lg-6">
+ <div class="row email-info-row">
+ <span class="col-lg-12">
+ <span class="col-lg-4">
+ <span class="pull-right">{vtranslate('LBL_FROM',$MODULE)}</span>
+ </span>
+ <span class="col-lg-8">
+ <span class="row-fluid">{$FROM}</span>
+ </span>
+ </span>
+ </div>
+ <div class="row email-info-row">
+ <span class="col-lg-12">
+ <span class="col-lg-4">
+ <span class="pull-right">{vtranslate('LBL_TO',$MODULE)}</span>
+ </span>
+ <span class="col-lg-8">
+ {if empty($TO)}
+ {assign var=TO value=array()}
+ {/if}
+ {assign var=TO_EMAILS value=","|implode:$TO}
+ <span class="row-fluid">
+ <span class="col-sm-10 paddingLeft0"><p class="textOverflowEllipsis">{$TO_EMAILS}</p></span>
+ {if $TO|@count > 1}
+ <span class="col-sm-2">
+ <a href="#" data-toggle="dropdown" style="text-transform: lowercase;">{vtranslate('LBL_MORE',$MODULE)}</a>
+ <ul class="dropdown-menu" style="padding:3px 6px; max-height:200px;" id="toAddressesDropdown">
+ {foreach item=TO_ADDRESS from=$TO}
+ <li>{$TO_ADDRESS}</li>
+ {/foreach}
+ </ul>
+ </span>
+ {/if}
+ </span>
+ </span>
+ </span>
+ </div>
+ </div>
+ <div class="col-lg-6">
+ <div class="email-preview-toolbar pull-right">
+ {if $RECORD->getEmailFlag() neq 'SAVED'}
+ <button type="button" name="previewReply" class="btn btn-sm btn-default" data-mode="emailReply">
+ {vtranslate('LBL_REPLY',$MODULE)}
+ </button>
+ {if count($TO) > 1 || !empty($CC) || !empty($BCC)}
+ <button type="button" name="previewReplyAll" class="btn btn-sm btn-default" data-mode="emailReplyAll">
+ {vtranslate('LBL_REPLY_ALL',$MODULE)}
+ </button>
+ {/if}
+ {/if}
+ <button type="button" name="previewForward" class="btn btn-sm btn-default" data-mode="emailForward">
+ {vtranslate('LBL_FORWARD',$MODULE)}
+ </button>
+ {if $RECORD->getEmailFlag() eq 'SAVED'}
+ <button type="button" name="previewEdit" class="btn btn-sm btn-default" data-mode="emailEdit">
+ {vtranslate('LBL_EDIT',$MODULE)}
+ </button>
+ {/if}
+ <button type="button" name="previewPrint" class="btn btn-sm btn-default" data-mode="previewPrint">
+ {vtranslate('LBL_PRINT',$MODULE)}
+ </button>
+ </div>
+ </div>
+ </div>
+ <div class="row">
+ <div class="col-lg-8">
+ {if !empty($CC)}
+ <div class="row email-info-row">
+ <span class="col-lg-12">
+ <span class="col-lg-3">
+ <span class="pull-right">{vtranslate('LBL_CC',$MODULE)}</span>
+ </span>
+ <span class="col-lg-9">
+ <span class="row-fluid">
+ {$CC}
+ </span>
+ </span>
+ </span>
+ </div>
+ {/if}
+ {if !empty($BCC)}
+ <div class="row hide email-info-row">
+ <span class="col-lg-12">
+ <span class="col-lg-3">
+ <span class="pull-right">{vtranslate('LBL_BCC',$MODULE)}</span>
+ </span>
+ <span class="col-lg-9">
+ <span class="row-fluid">
+ {$BCC}
+ </span>
+ </span>
+ </span>
+ </div>
+ {/if}
- <div class="row email-info-row">
- <span class="col-lg-12">
- <span class="col-lg-3">
- <span class="pull-right">{vtranslate('LBL_ATTACHMENT',$MODULE)}</span>
- </span>
- <span class="col-lg-9">
- {if count($RECORD->getAttachmentDetails()) le 0}
- {vtranslate('LBL_NO_ATTACHMENTS',$MODULE)}
- {else}
- {foreach item=ATTACHMENT_DETAILS from=$RECORD->getAttachmentDetails()}
- <i class="fa fa-download"></i>
- <a
- {if array_key_exists('docid',$ATTACHMENT_DETAILS)}
- href="index.php?module=Documents&action=DownloadFile&record={$ATTACHMENT_DETAILS['docid']}
- &fileid={$ATTACHMENT_DETAILS['fileid']}"
- {else}
- href="index.php?module=Emails&action=DownloadFile&attachment_id={$ATTACHMENT_DETAILS['fileid']}"
- {/if}
+ <div class="row email-info-row">
+ <span class="col-lg-12">
+ <span class="col-lg-3">
+ <span class="pull-right">{vtranslate('LBL_SUBJECT',$MODULE)}</span>
+ </span>
+ <span class="col-lg-9">
+ {$RECORD->get('subject')}
+ </span>
+ </span>
+ </div>
- >{$ATTACHMENT_DETAILS['attachment']}</a>
- {/foreach}
- {/if}
- </span>
- </span>
- </div>
- </div>
- </div>
- <textarea style="display:none;" id="iframeDescription">{$RECORD->get('description')}</textarea>
- <div class="row email-info-row">
- <div class="col-lg-2" style="padding-right:10px;">
- <div class="pull-right">{vtranslate('LBL_DESCRIPTION',$MODULE)}</div>
- </div>
- <div class="col-lg-10">
- <div class="email-body-preview">
- <iframe frameBorder="0" scrolling='yes' id="emailPreviewIframe" style='width: 100%; overflow-y:visible; height:100%;'>
- </iframe>
- </div>
- </div>
- </div>
- <hr>
- <div class="row">
- <span class="col-lg-12" style="text-align: center;">
- <span class="muted">
- {if $RECORD->get('email_flag') eq "SAVED"}
- <small><em>{vtranslate('LBL_DRAFTED_ON',$MODULE)}</em></small>
- <span><small><em> {Vtiger_Util_Helper::formatDateTimeIntoDayString($RECORD->get('createdtime'))}</em></small></span>
- {else}
- <small><em>{vtranslate('LBL_SENT_ON',$MODULE)}</em></small>
- {assign var="SEND_TIME" value=$RECORD->get('date_start')|@cat:' '|@cat:$RECORD->get('time_start')}
- <span><small><em> {Vtiger_Util_Helper::formatDateTimeIntoDayString($SEND_TIME)}</em></small></span>
- {/if}
- </span>
- </span>
- </div>
- <div class="row">
- <span class="col-lg-12" style="text-align: center;">
- <span><strong> {vtranslate('LBL_OWNER',$MODULE)} : {getOwnerName($RECORD->get('assigned_user_id'))}</strong></span>
- </span>
- </div>
- </div>
- </form>
- </div>
- </div>
+ <div class="row email-info-row">
+ <span class="col-lg-12">
+ <span class="col-lg-3">
+ <span class="pull-right">{vtranslate('LBL_ATTACHMENT',$MODULE)}</span>
+ </span>
+ <span class="col-lg-9">
+ {if count($RECORD->getAttachmentDetails()) le 0}
+ {vtranslate('LBL_NO_ATTACHMENTS',$MODULE)}
+ {else}
+ {foreach item=ATTACHMENT_DETAILS from=$RECORD->getAttachmentDetails()}
+ <i class="fa fa-download"></i>
+ <a {if array_key_exists('docid',$ATTACHMENT_DETAILS)}
+ href="index.php?module=Documents&action=DownloadFile&record={$ATTACHMENT_DETAILS['docid']}&fileid={$ATTACHMENT_DETAILS['fileid']}"
+ {else}
+ href="index.php?module=Emails&action=DownloadFile&attachment_id={$ATTACHMENT_DETAILS['fileid']}"
+ {/if}>{$ATTACHMENT_DETAILS['attachment']}</a>
+ {/foreach}
+ {/if}
+ </span>
+ </span>
+ </div>
+ </div>
+ </div>
+ <textarea style="display:none;" id="iframeDescription">{$RECORD->get('description')}</textarea>
+ <div class="row email-info-row">
+ <div class="col-lg-2" style="padding-right:10px;">
+ <div class="pull-right">{vtranslate('LBL_DESCRIPTION',$MODULE)}</div>
+ </div>
+ <div class="col-lg-10">
+ <div class="email-body-preview">
+ <iframe frameBorder="0" scrolling='yes' id="emailPreviewIframe" style='width: 100%; overflow-y:visible; height:100%;'>
+ </iframe>
+ </div>
+ </div>
+ </div>
+ <hr>
+ <div class="row">
+ <span class="col-lg-12" style="text-align: center;">
+ <span class="muted">
+ {if $RECORD->get('email_flag') eq "SAVED"}
+ <small><em>{vtranslate('LBL_DRAFTED_ON',$MODULE)}</em></small>
+ <span><small><em> {Vtiger_Util_Helper::formatDateTimeIntoDayString($RECORD->get('createdtime'))}</em></small></span>
+ {else}
+ <small><em>{vtranslate('LBL_SENT_ON',$MODULE)}</em></small>
+ {assign var="SEND_TIME" value=$RECORD->get('date_start')|@cat:' '|@cat:$RECORD->get('time_start')}
+ <span><small><em> {Vtiger_Util_Helper::formatDateTimeIntoDayString($SEND_TIME)}</em></small></span>
+ {/if}
+ </span>
+ </span>
+ </div>
+ <div class="row">
+ <span class="col-lg-12" style="text-align: center;">
+ <span><strong> {vtranslate('LBL_OWNER',$MODULE)} : {getOwnerName($RECORD->get('assigned_user_id'))}</strong></span>
+ </span>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
{/strip}