NEW Look and feel - Checkboxes and radio buttons are larger
This commit is contained in:
parent
865198309a
commit
191f6ba00e
5 changed files with 28 additions and 7 deletions
|
|
@ -540,7 +540,7 @@ if (empty($reshook) && $action == 'add' && $usercancreate) {
|
|||
if ($object->recurrule && preg_match('/FREQ=WEEKLY.*BYDAY(\d+)/i', $object->recurrule, $reg3)) {
|
||||
$selectedrecurrulebyday = (int) $reg3[1];
|
||||
}
|
||||
|
||||
var_dump($object->recurrule);exit;
|
||||
// Is event recurrent ?
|
||||
$eventisrecurring = 0;
|
||||
$userepeatevent = (getDolGlobalInt('MAIN_FEATURES_LEVEL') == 2 ? 1 : 0);
|
||||
|
|
@ -1594,7 +1594,7 @@ if ($action == 'create') {
|
|||
}
|
||||
|
||||
if (isModEnabled('resource')) {
|
||||
// Categories
|
||||
// Resources
|
||||
print '<tr><td class="tdtop nowrap">'.$langs->trans("Resource").'</td><td>';
|
||||
|
||||
$listofresourceid = array();
|
||||
|
|
|
|||
|
|
@ -2523,7 +2523,10 @@ class Form
|
|||
if ($showproperties) {
|
||||
if ($ownerid == $value['id'] && is_array($listofuserid) && count($listofuserid) && in_array($ownerid, array_keys($listofuserid))) {
|
||||
$out .= '<div class="myavailability inline-block">';
|
||||
$out .= '<span class="hideonsmartphone"> - <span class="opacitymedium">' . $langs->trans("Availability") . ':</span> </span><input id="transparency" class="paddingrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofuserid[$ownerid]['transparency'] ? ' checked' : '') . '><label for="transparency">' . $langs->trans("Busy") . '</label>';
|
||||
$out .= '<span class="hideonsmartphone"> - ';
|
||||
//$out .= '<span class="opacitymedium">' . $langs->trans("Availability") . ':</span>';
|
||||
$out .= '</span>';
|
||||
$out .= ' <input title="'.$langs->trans("Availability").'" id="transparency" class="paddingrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofuserid[$ownerid]['transparency'] ? ' checked' : '') . '><label for="transparency">' . $langs->trans("Busy") . '</label>';
|
||||
$out .= '</div>';
|
||||
}
|
||||
}
|
||||
|
|
@ -2613,7 +2616,10 @@ class Form
|
|||
if ($showproperties) {
|
||||
if (is_array($listofresourceid) && count($listofresourceid)) {
|
||||
$out .= '<div class="myavailability inline-block">';
|
||||
$out .= '<span class="hideonsmartphone"> - <span class="opacitymedium">' . $langs->trans("Availability") . ':</span> </span><input id="transparencyresource'.$value['id'].'" class="paddingrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofresourceid[$value['id']]['transparency'] ? ' checked' : '') . '><label for="transparencyresource'.$value['id'].'">' . $langs->trans("Busy") . '</label>';
|
||||
$out .= '<span class="hideonsmartphone"> - ';
|
||||
//$out .= '<span class="opacitymedium">' . $langs->trans("Availability") . ': </span>';
|
||||
$out .= '</span>';
|
||||
$out .= ' <input title="'.$langs->trans("Availability").'" id="transparencyresource'.$value['id'].'" class="paddingrightonly" ' . ($action == 'view' ? 'disabled' : '') . ' type="checkbox" name="transparency"' . ($listofresourceid[$value['id']]['transparency'] ? ' checked' : '') . '><label for="transparencyresource'.$value['id'].'">' . $langs->trans("Busy") . '</label>';
|
||||
$out .= '</div>';
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ class FormActions
|
|||
print ajax_combobox('select'.$htmlname, array(), 0, 0, 'resolve', '-1', $morecss);
|
||||
|
||||
if (empty($onlyselect)) {
|
||||
print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
|
||||
print ' <input type="text" id="val'.$htmlname.'" name="percentage" class="flat hideifna heightofcombo" value="'.($selected >= 0 ? $selected : '').'" size="2"'.($canedit && ($selected >= 0) ? '' : ' disabled').'>';
|
||||
print '<span class="hideonsmartphone hideifna">%</span>';
|
||||
}
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -410,7 +410,8 @@ input[type=submit], input[type=submit]:hover {
|
|||
margin-left: 5px;
|
||||
}
|
||||
input[type=checkbox], input[type=radio] {
|
||||
margin: 0 3px 0 1px;
|
||||
margin: 0 5px 0 1px;
|
||||
transform: scale(1.2);
|
||||
}
|
||||
.kanban input.checkforselect {
|
||||
margin-right: 0px;
|
||||
|
|
@ -7124,6 +7125,13 @@ div.dataTables_length select {
|
|||
/* Select2 */
|
||||
/* ============================================================================== */
|
||||
|
||||
.heightofcombo {
|
||||
height: 28px;
|
||||
}
|
||||
.select2-container .select2-selection--single {
|
||||
height: 28px;
|
||||
}
|
||||
|
||||
span.select2-selection--single.flat[aria-disabled="true"] span.select2-selection__rendered {
|
||||
opacity: 0.5;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -952,7 +952,8 @@ input:-webkit-autofill {
|
|||
}
|
||||
|
||||
input[type=checkbox], input[type=radio] {
|
||||
margin: 0 3px 0 1px;
|
||||
margin: 0 5px 0 1px;
|
||||
transform: scale(1.2);
|
||||
}
|
||||
.kanban input.checkforselect {
|
||||
margin-right: 0px;
|
||||
|
|
@ -7033,6 +7034,12 @@ div.dataTables_length select {
|
|||
/* Select2 */
|
||||
/* ============================================================================== */
|
||||
|
||||
.heightofcombo {
|
||||
height: 28px;
|
||||
}
|
||||
.select2-container .select2-selection--single {
|
||||
height: 28px;
|
||||
}
|
||||
input.select2-input {
|
||||
border-bottom: none ! important;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue