lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Look and feel v13

Browse Source
This commit is contained in:
Laurent Destailleur 2020-09-22 09:42:44 +02:00
parent c61e8f052b
commit 830bc7d871
6 changed files with 68 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/langs/en_US/admin.lang
View File

@ -1075,6 +1075,7 @@ LabelUsedByDefault=Label used by default if no translation can be found for code
LabelOnDocuments=Label on documents LabelOnDocuments=Label on documents
LabelOrTranslationKey=Label or translation key LabelOrTranslationKey=Label or translation key
ValueOfConstantKey=Value of a configuration constant ValueOfConstantKey=Value of a configuration constant
ConstantIsOn=Option %s is on
NbOfDays=No. of days NbOfDays=No. of days
AtEndOfMonth=At end of month AtEndOfMonth=At end of month
CurrentNext=Current/Next CurrentNext=Current/Next

2
htdocs/langs/en_US/modulebuilder.lang
View File

@ -77,7 +77,7 @@ IsAMeasure=Is a measure
DirScanned=Directory scanned DirScanned=Directory scanned
NoTrigger=No trigger NoTrigger=No trigger
NoWidget=No widget NoWidget=No widget
GoToApiExplorer=Go to API explorer GoToApiExplorer=API explorer
ListOfMenusEntries=List of menu entries ListOfMenusEntries=List of menu entries
ListOfDictionariesEntries=List of dictionaries entries ListOfDictionariesEntries=List of dictionaries entries
ListOfPermissionsDefined=List of defined permissions ListOfPermissionsDefined=List of defined permissions

57
htdocs/modulebuilder/index.php
View File

@ -94,6 +94,7 @@ $result = restrictedArea($user, 'modulebuilder', null);
$error = 0; $error = 0;
$form = new Form($db);
// Define $listofmodules // Define $listofmodules
$dirsrootforscan = array($dirread); $dirsrootforscan = array($dirread);
@ -101,7 +102,7 @@ $dirsrootforscan = array($dirread);
if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >= 2 || !empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT))) { $dirsrootforscan[] = DOL_DOCUMENT_ROOT; } if ($dirread != DOL_DOCUMENT_ROOT && ($conf->global->MAIN_FEATURES_LEVEL >= 2 || !empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT))) { $dirsrootforscan[] = DOL_DOCUMENT_ROOT; }
// Search modules to edit // Search modules to edit
$textforlistofdirs = '<!-- Scanned dir -->'."\n"; $textforlistofdirs = '<!-- Directory scanned -->'."\n";
$listofmodules = array(); $listofmodules = array();
$i = 0; $i = 0;
foreach ($dirsrootforscan as $dirread) foreach ($dirsrootforscan as $dirread)
@ -170,6 +171,10 @@ foreach ($dirsrootforscan as $dirread)
if (empty($i)) $textforlistofdirs .= $langs->trans("DirScanned").' : '; if (empty($i)) $textforlistofdirs .= $langs->trans("DirScanned").' : ';
else $textforlistofdirs .= ', '; else $textforlistofdirs .= ', ';
$textforlistofdirs .= '<strong class="wordbreakimp">'.$dirread.'</strong>'; $textforlistofdirs .= '<strong class="wordbreakimp">'.$dirread.'</strong>';
if ($dirread == DOL_DOCUMENT_ROOT) {
if ($conf->global->MAIN_FEATURES_LEVEL >= 2) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MAIN_FEATURES_LEVEL"));
if (! empty($conf->global->MODULEBUILDER_ADD_DOCUMENT_ROOT)) $textforlistofdirs .= $form->textwithpicto('', $langs->trans("ConstantIsOn", "MODULEBUILDER_ADD_DOCUMENT_ROOT"));
}
$i++; $i++;
} }
@ -1562,7 +1567,7 @@ llxHeader('', $langs->trans("ModuleBuilder"), '', '', 0, 0,
'/includes/ace/src/ext-statusbar.js', '/includes/ace/src/ext-statusbar.js',
'/includes/ace/src/ext-language_tools.js', '/includes/ace/src/ext-language_tools.js',
//'/includes/ace/src/ext-chromevox.js' //'/includes/ace/src/ext-chromevox.js'
), array()); ), array(), '', 'classforhorizontalscrolloftabs');
$text = $langs->trans("ModuleBuilder"); $text = $langs->trans("ModuleBuilder");
@ -2558,6 +2563,7 @@ if ($module == 'initmodule')
print '<th class="center">'.$form->textwithpicto($langs->trans("SearchAll"), $langs->trans("SearchAllDesc")).'</th>'; print '<th class="center">'.$form->textwithpicto($langs->trans("SearchAll"), $langs->trans("SearchAllDesc")).'</th>';
print '<th class="center">'.$form->textwithpicto($langs->trans("IsAMeasure"), $langs->trans("IsAMeasureDesc")).'</th>'; print '<th class="center">'.$form->textwithpicto($langs->trans("IsAMeasure"), $langs->trans("IsAMeasureDesc")).'</th>';
print '<th class="center">'.$langs->trans("CSSClass").'</th>'; print '<th class="center">'.$langs->trans("CSSClass").'</th>';
print '<th class="center">'.$langs->trans("CSSViewClass").'</th>';
print '<th class="center">'.$langs->trans("KeyForTooltip").'</th>'; print '<th class="center">'.$langs->trans("KeyForTooltip").'</th>';
print '<th class="center">'.$langs->trans("ShowOnCombobox").'</th>'; print '<th class="center">'.$langs->trans("ShowOnCombobox").'</th>';
//print '<th class="center">'.$langs->trans("Disabled").'</th>'; //print '<th class="center">'.$langs->trans("Disabled").'</th>';
@ -2589,6 +2595,7 @@ if ($module == 'initmodule')
print '<td class="center"><input class="text" size="2" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall', 'alpha')).'"></td>'; print '<td class="center"><input class="text" size="2" name="propsearchall" value="'.dol_escape_htmltag(GETPOST('propsearchall', 'alpha')).'"></td>';
print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>'; print '<td class="center"><input class="text" size="2" name="propisameasure" value="'.dol_escape_htmltag(GETPOST('propisameasure', 'alpha')).'"></td>';
print '<td class="center"><input class="text" size="2" name="propcss" value="'.dol_escape_htmltag(GETPOST('propcss', 'alpha')).'"></td>'; print '<td class="center"><input class="text" size="2" name="propcss" value="'.dol_escape_htmltag(GETPOST('propcss', 'alpha')).'"></td>';
print '<td class="center"><input class="text" size="2" name="propcssview" value="'.dol_escape_htmltag(GETPOST('propcssview', 'alpha')).'"></td>';
print '<td class="center"><input class="text" size="2" name="prophelp" value="'.dol_escape_htmltag(GETPOST('prophelp', 'alpha')).'"></td>'; print '<td class="center"><input class="text" size="2" name="prophelp" value="'.dol_escape_htmltag(GETPOST('prophelp', 'alpha')).'"></td>';
print '<td class="center"><input class="text" size="2" name="propshowoncombobox" value="'.dol_escape_htmltag(GETPOST('propshowoncombobox', 'alpha')).'"></td>'; print '<td class="center"><input class="text" size="2" name="propshowoncombobox" value="'.dol_escape_htmltag(GETPOST('propshowoncombobox', 'alpha')).'"></td>';
//print '<td class="center"><input class="text" size="2" name="propdisabled" value="'.dol_escape_htmltag(GETPOST('propdisabled', 'alpha')).'"></td>'; //print '<td class="center"><input class="text" size="2" name="propdisabled" value="'.dol_escape_htmltag(GETPOST('propdisabled', 'alpha')).'"></td>';
@ -2629,6 +2636,7 @@ if ($module == 'initmodule')
$propsearchall = $propval['searchall']; $propsearchall = $propval['searchall'];
$propisameasure = $propval['isameasure']; $propisameasure = $propval['isameasure'];
$propcss = $propval['css']; $propcss = $propval['css'];
$propcssview = $propval['cssview'];
$prophelp = $propval['help']; $prophelp = $propval['help'];
$propshowoncombobox = $propval['showoncombobox']; $propshowoncombobox = $propval['showoncombobox'];
//$propdisabled=$propval['disabled']; //$propdisabled=$propval['disabled'];
@ -2637,63 +2645,70 @@ if ($module == 'initmodule')
print '<tr class="oddeven">'; print '<tr class="oddeven">';
print '<td>'; print '<td>';
print $propname; print dol_escape_htmltag($propname);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $proplabel; print dol_escape_htmltag($proplabel);
print '</td>'; print '</td>';
print '<td class="wordbreak">'; print '<td class="tdoverflowmax200">';
print $proptype; print '<span title="'.dol_escape_htmltag($proptype).'">'.dol_escape_htmltag($proptype).'</span>';
print '</td>'; print '</td>';
print '<td class="wordbreak">'; print '<td class="tdoverflowmax200">';
if ($proparrayofkeyval) { if ($proparrayofkeyval) {
print json_encode($proparrayofkeyval); print '<span title="'.dol_escape_htmltag(json_encode($proparrayofkeyval)).'">';
print dol_escape_htmltag(json_encode($proparrayofkeyval));
print '</span>';
} }
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propnotnull; print dol_escape_htmltag($propnotnull);
print '</td>'; print '</td>';
print '<td>'; print '<td>';
print $propdefault; print dol_escape_htmltag($propdefault);
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propindex ? '1' : ''; print $propindex ? '1' : '';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propforeignkey ? $propforeignkey : ''; print $propforeignkey ? dol_escape_htmltag($propforeignkey) : '';
print '</td>'; print '</td>';
print '<td class="right">'; print '<td class="right">';
print $propposition; print dol_escape_htmltag($propposition);
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propenabled ? $propenabled : ''; print $propenabled ? dol_escape_htmltag($propenabled) : '';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propvisible ? $propvisible : '0'; print $propvisible ? dol_escape_htmltag($propvisible) : '0';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propnoteditable ? $propnoteditable : ''; print $propnoteditable ? dol_escape_htmltag($propnoteditable) : '';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propsearchall ? '1' : ''; print $propsearchall ? '1' : '';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propisameasure ? $propisameasure : ''; print $propisameasure ? dol_escape_htmltag($propisameasure) : '';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propcss ? $propcss : ''; print $propcss ? dol_escape_htmltag($propcss) : '';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $prophelp ? $prophelp : ''; print $propcssview ? dol_escape_htmltag($propcssview) : '';
print '</td>';
print '<td class="tdoverflowmax200">';
print $prophelp ? dol_escape_htmltag($prophelp) : '';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
print $propshowoncombobox ? $propshowoncombobox : ''; print $propshowoncombobox ? dol_escape_htmltag($propshowoncombobox) : '';
print '</td>'; print '</td>';
/*print '<td class="center">'; /*print '<td class="center">';
print $propdisabled?$propdisabled:''; print $propdisabled?$propdisabled:'';
print '</td>';*/ print '</td>';*/
print '<td>'; print '<td class="tdoverflowmax200">';
print $propcomment; print '<span title="'.dol_escape_htmltag($propcomment).'">';
print dol_escape_htmltag($propcomment);
print '</span>';
print '</td>'; print '</td>';
print '<td class="center">'; print '<td class="center">';
if ($propname != 'rowid') if ($propname != 'rowid')

2
htdocs/modulebuilder/template/class/myobject.class.php
View File

@ -102,7 +102,7 @@ class MyObject extends CommonObject
'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'), 'rowid' => array('type'=>'integer', 'label'=>'TechnicalID', 'enabled'=>1, 'visible'=>-2, 'noteditable'=>1, 'notnull'=> 1, 'index'=>1, 'position'=>1, 'comment'=>'Id', 'css'=>'left'),
'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'), 'ref' => array('type'=>'varchar(128)', 'label'=>'Ref', 'enabled'=>1, 'visible'=>1, 'noteditable'=>0, 'default'=>'', 'notnull'=> 1, 'showoncombobox'=>1, 'index'=>1, 'position'=>10, 'searchall'=>1, 'comment'=>'Reference of object'),
'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20), 'entity' => array('type'=>'integer', 'label'=>'Entity', 'enabled'=>1, 'visible'=>0, 'notnull'=> 1, 'default'=>1, 'index'=>1, 'position'=>20),
'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth200', 'help'=>'Help text', 'showoncombobox'=>1), 'label' => array('type'=>'varchar(255)', 'label'=>'Label', 'enabled'=>1, 'visible'=>1, 'position'=>30, 'searchall'=>1, 'css'=>'minwidth300', 'cssview'=>'wordbreak', 'help'=>'Help text', 'showoncombobox'=>1),
'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'), 'amount' => array('type'=>'price', 'label'=>'Amount', 'enabled'=>1, 'visible'=>1, 'default'=>'null', 'position'=>40, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for amount'),
'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'), 'qty' => array('type'=>'real', 'label'=>'Qty', 'enabled'=>1, 'visible'=>1, 'default'=>'0', 'position'=>45, 'searchall'=>0, 'isameasure'=>1, 'help'=>'Help text for quantity', 'css'=>'maxwidth75imp'),
'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'), 'fk_soc' => array('type'=>'integer:Societe:societe/class/societe.class.php:1:status=1 AND entity IN (__SHARED_ENTITIES__)', 'label'=>'ThirdParty', 'visible'=> 1, 'enabled'=>1, 'position'=>50, 'notnull'=>-1, 'index'=>1, 'help'=>'LinkToThirparty'),

20
htdocs/theme/eldy/global.inc.php
View File

@ -191,10 +191,6 @@ input, select {
#mainbody input.button:not(.buttongen):not(.bordertransp) { #mainbody input.button:not(.buttongen):not(.bordertransp) {
background: var(--butactionbg); background: var(--butactionbg);
color: #FFF !important; color: #FFF !important;
/* -webkit-box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1);
box-shadow: 0px 0px 1px 1px rgba(0, 0, 0, 0.2), 0px 0px 0px rgba(60,60,60,0.1); */
border-radius: 3px; border-radius: 3px;
border-collapse: collapse; border-collapse: collapse;
border: none; border: none;
@ -220,7 +216,6 @@ input:invalid, select:invalid {
/* Focus definitions must be after standard definition */ /* Focus definitions must be after standard definition */
textarea:focus { textarea:focus {
/* v6 box-shadow: 0 0 4px #8091BF; */
border: 1px solid #aaa !important; border: 1px solid #aaa !important;
} }
input:focus, select:focus { input:focus, select:focus {
@ -571,6 +566,9 @@ th .button {
.centpercent { .centpercent {
width: 100%; width: 100%;
} }
.centpercentwithoutmenu {
width: calc(100% - 200px);
}
.quatrevingtpercent, .inputsearch { .quatrevingtpercent, .inputsearch {
width: 80%; width: 80%;
} }
@ -1495,20 +1493,20 @@ td.showDragHandle {
padding-bottom: 20px; padding-bottom: 20px;
} }
/* For having horizontal scroll into array (like with smartphone) */ /* DOL_XXX For having horizontal scroll into array (like with smartphone) */
/*
#id-container { .classforhorizontalscrolloftabs #id-container {
width: 100%; width: 100%;
} }
.side-nav { .classforhorizontalscrolloftabs .side-nav {
display: block; display: block;
float: left; float: left;
} }
#id-right { .classforhorizontalscrolloftabs #id-right {
width:calc(100% - 210px); width:calc(100% - 210px);
display: inline-block; display: inline-block;
} }
*/
<?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) { ?> <?php if (empty($conf->global->THEME_DISABLE_STICKY_TOPMENU)) { ?>

23
htdocs/theme/md/style.css.php
View File

@ -1461,6 +1461,22 @@ td.showDragHandle {
<?php } ?> <?php } ?>
} }
/* DOL_XXX For having horizontal scroll into array (like with smartphone) */
.classforhorizontalscrolloftabs #id-container {
width: 100%;
}
.classforhorizontalscrolloftabs .side-nav {
display: block;
float: left;
}
.classforhorizontalscrolloftabs #id-right {
width:calc(100% - 210px);
display: inline-block;
}
.side-nav { .side-nav {
<?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?> <?php if (GETPOST('optioncss', 'aZ09') == 'print') { ?>
display: none; display: none;
@ -1513,9 +1529,10 @@ td.showDragHandle {
?> ?>
} }
/*
* Slide animation /**
*/ * Slide animation
*/
.side-nav-vert, #id-right { .side-nav-vert, #id-right {
transition: padding-left 0.5s ease, margin-left 0.5s ease; transition: padding-left 0.5s ease, margin-left 0.5s ease;
} }