Merge branch 'Recurrence_event_UI' into 'master'

Fixes #1405 Recurrence event edit-view usability is addressed

See merge request !700

layouts/v7/modules/Events/uitypes/Multireference.tpl

@@ -42,12 +42,12 @@
 			</span>
 
 			<input type="hidden" name="relatedContactInfo" data-value='{json_encode($RELATED_CONTACTS, $smarty.const.JSON_HEX_APOS)}' />
+                        <!-- Show the add button only if it is edit view  -->
+                        {if $smarty.request.view eq 'Edit'}
+                            <span class="input-group-addon createReferenceRecord cursorPointer clearfix" title="{vtranslate('LBL_CREATE', $MODULE)}">
+                                    <i id="{$MODULE}_editView_fieldName_{$FIELD_NAME}_create" class="fa fa-plus"></i>
+                            </span>
+                        {/if}
 		</div>
-		<!-- Show the add button only if it is edit view  -->
-		{if $smarty.request.view eq 'Edit'}
-			<span class="createReferenceRecord cursorPointer clearfix" title="{vtranslate('LBL_CREATE', $MODULE)}">
-				<i id="{$MODULE}_editView_fieldName_{$FIELD_NAME}_create" class="fa fa-plus"></i>
-			</span>
-		{/if}
 	</div>
 {/strip}

layouts/v7/modules/Vtiger/partials/EditViewContents.tpl

@@ -92,7 +92,7 @@
 										&nbsp;{if $FIELD_MODEL->isMandatory() eq true} <span class="redColor">*</span> {/if}
 									</td>
 									{if $FIELD_MODEL->get('uitype') neq '83'}
-										<td class="fieldValue" {if $FIELD_MODEL->getFieldDataType() eq 'boolean'} style="width:25%" {/if} {if $FIELD_MODEL->get('uitype') eq '19'} colspan="3" {assign var=COUNTER value=$COUNTER+1} {/if}>
+										<td class="fieldValue" {if $FIELD_MODEL->getFieldDataType() eq 'boolean'} style="width:25%" {/if} {if ($FIELD_MODEL->get('uitype') eq '19' )|| ($FIELD_MODEL->get('uitype') eq '16')} colspan="3" {assign var=COUNTER value=$COUNTER+1} {/if}>
 											{include file=vtemplate_path($FIELD_MODEL->getUITypeModel()->getTemplateName(),$MODULE)}
 										</td>
 									{/if}

layouts/v7/modules/Vtiger/uitypes/Recurrence.tpl

@@ -10,34 +10,34 @@
 ********************************************************************************/
 -->*}
 {strip}
-	<div class="row" style="width:540px;">
-		<div style="float: left;margin-top: 7px; padding-left:15px;">
+	<div class="row">
+		<div class="col-sm-1">
 			{if $RECURRING_INFORMATION['recurringcheck'] eq 'Yes' && !$smarty.request.isDuplicate}
 				<input type="hidden" class="recurringEdit" value="true" />
 			{/if}
 			<input type="checkbox" name="recurringcheck" data-field-id= '{$FIELD_MODEL->get('id')}' value="" {if $RECURRING_INFORMATION['recurringcheck'] eq 'Yes'}checked{/if}/>&nbsp;&nbsp;
 		</div>
-		<div class="" id="repeatUI" style="visibility: {if $RECURRING_INFORMATION['recurringcheck'] eq 'Yes'}visible{else}collapse{/if};">
-			<div>
-				<span>
-					<span class="alignMiddle">{vtranslate('LBL_REPEATEVENT', $MODULE)}&nbsp;&nbsp;</span>
-					<select class="select2 input-mini" name="repeat_frequency">
-						{for $FREQUENCY = 1 to 14}
-							<option value="{$FREQUENCY}" {if $FREQUENCY eq $RECURRING_INFORMATION['repeat_frequency']}selected{/if}>{$FREQUENCY}</option>
-						{/for}
-					</select>
+		<div id="repeatUI" style="visibility: {if $RECURRING_INFORMATION['recurringcheck'] eq 'Yes'}visible{else}collapse{/if};" class="col-sm-9">
+			<div class="row">
+				<span class="col-sm-2 padding0px">
+                                    <span class="alignMiddle">{vtranslate('LBL_REPEATEVENT', $MODULE)}&nbsp;&nbsp;</span>
+                                    <select class="select2 input-mini" name="repeat_frequency">
+                                            {for $FREQUENCY = 1 to 14}
+                                                    <option value="{$FREQUENCY}" {if $FREQUENCY eq $RECURRING_INFORMATION['repeat_frequency']}selected{/if}>{$FREQUENCY}</option>
+                                            {/for}
+                                    </select>
 				</span>
-				<span>
+				<span class="col-sm-2 padding0px">
 					<select class="select2 input-medium" style="width:100px;margin-left: 10px;" name="recurringtype" id="recurringType">
 						<option value="Daily" {if $RECURRING_INFORMATION['eventrecurringtype'] eq 'Daily'} selected {/if}>{vtranslate('LBL_DAYS_TYPE', $MODULE)}</option>
 						<option value="Weekly" {if $RECURRING_INFORMATION['eventrecurringtype'] eq 'Weekly'} selected {/if}>{vtranslate('LBL_WEEKS_TYPE', $MODULE)}</option>
 						<option value="Monthly" {if $RECURRING_INFORMATION['eventrecurringtype'] eq 'Monthly'} selected {/if}>{vtranslate('LBL_MONTHS_TYPE', $MODULE)}</option>
 						<option value="Yearly" {if $RECURRING_INFORMATION['eventrecurringtype'] eq 'Yearly'} selected {/if}>{vtranslate('LBL_YEAR_TYPE', $MODULE)}</option>
 					</select>
+                                        <span class="alignMiddle displayInlineBlock">&nbsp;&nbsp;{vtranslate('LBL_UNTIL', $MODULE)}</span>
 				</span>
-				<span>
-					<span class="alignMiddle displayInlineBlock">&nbsp;&nbsp;{vtranslate('LBL_UNTIL', $MODULE)}</span>
-					<span class="input-group date pull-right inputElement">
+				<span class="col-sm-6 padding0px">
+					<span class="input-group date inputElement">
 						<input type="text" id="calendar_repeat_limit_date" class="dateField input-small form-control" name="calendar_repeat_limit_date" data-date-format="{$USER_MODEL->get('date_format')}" 
 							   value="{if $RECURRING_INFORMATION['recurringcheck'] neq 'Yes'}{$TOMORROWDATE}{elseif $RECURRING_INFORMATION['recurringcheck'] eq 'Yes'}{$RECURRING_INFORMATION['recurringenddate']}{/if}" 
 							   data-rule-date="true" data-rule-required="true"/>