Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Work on select2 prototype.

Browse Source
This commit is contained in:
Laurent Destailleur 2014-12-07 23:51:36 +01:00
parent 3186a8c23f
commit ec0c7476fb
3 changed files with 51 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/main.inc.php
View File

@ -992,6 +992,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
$ext='';
if (! empty($conf->dol_use_jmobile)) $ext='version='.urlencode(DOL_VERSION);
if (GETPOST('version')) $ext='version='.GETPOST('version','int'); // usefull to force no cache on css/js
if (! defined('DISABLE_JQUERY') && ! $disablejs && $conf->use_javascript_ajax)
{

28
htdocs/public/test/test_forms.php
View File

@ -21,8 +21,8 @@ llxHeader();
This page is a sample of page using Dolibarr HTML widget methods. It is designed to make test with<br>
- css (edit page to change to test another css)<br>
- jmobile (add parameter dol_use_jmobile=1 to enable view with jmobile)<br>
<br>
</h1>
<br>
<!-- Output to test html.form.class.php -->
<?php
@ -49,21 +49,35 @@ $form->select_date(dol_get_first_day(1970,1,false), 'test3', 1, 1, 0);
print '<br><br>'."\n";
// Test4: a multiselect
print "Test 4: a multiselect<br>\n";
// Test4a: form->select_product
print "Test 4: Select product - ";
$form->select_produits(0,'producttest');
print '<br><br>'."\n";
// Test4b: form->selectarray
print "Test 4: Select array - ";
$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
$arrayselected=array(1,3);
print $form->selectarray('selectarray',$array);
print '<br><br>'."\n";
// Test5: a multiselect
print "Test 5: a multiselect<br>\n";
$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
$arrayselected=array(1,3);
print $form->multiselectarray('testmulti', $array, $arrayselected, '', 0, '', 0, 250);
print '<br><br>'."\n";
// Test5: a select
print "Test 5a: a select<br>\n";
// Test6: a select
print "Test 6a: a select<br>\n";
$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3 ith a very long text. aze eazeae e ae aeae a e a ea ea ea e a e aea e ae aeaeaeaze.');
$selected=3;
print $form->selectarray('testselecta', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);
print '<br>';
print "Test 5b: a select<br>\n";
print '<br><br>';
print "Test 6b: a select<br>\n";
$array=array(1=>'Value 1',2=>'Value 2',3=>'Value 3');
$selected=3;
print $form->selectarray('testselectb', $array, $selected, 1, 0, 0, 'style="min-width: 250px;"', 0, 0, 0, '', '', 1);

32
htdocs/theme/eldy/style.css.php
View File

@ -107,7 +107,7 @@ $colorbacklinepair2='255,255,255'; // line pair
$colorbacklinepairhover=(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9)).','.(230+round(($isred+$isgreen+$isblue)/9));
$colorbackbody='#f9f9f9';
$colortext='40,40,40';
$fontsize='12';
$fontsize='13';
$fontsizesmaller='11';
// Eldy colors
@ -263,7 +263,7 @@ input, textarea, select {
border-top:solid 1px rgba(0,0,0,.3);
border-bottom:solid 1px rgba(0,0,0,.2);
/* box-shadow: 1px 1px 1px rgba(0,0,0,.2) inset;*/
padding:2px;
padding:4px;
margin-left:1px;
margin-bottom:1px;
margin-top:1px;
@ -2454,6 +2454,7 @@ li.cal_event { border: none; list-style-type: none; }
cursor:pointer;
}
/* ============================================================================== */
/* jQuery - jeditable */
/* ============================================================================== */
@ -2642,7 +2643,7 @@ A.none, A.none:active, A.none:visited, A.none:hover {
{
line-height: 1em !important;
}
.ui-autocomplete-input { margin: 0; padding: 2px; }
.ui-autocomplete-input { margin: 0; padding: 4px; }
/* ============================================================================== */
@ -2910,6 +2911,31 @@ div.dolEventError h1, div.dolEventError h2 {
background-image: none;
}
/* ============================================================================== */
/* Select2 */
/* ============================================================================== */
.select2-choice,
.select2-drop.select2-drop-above.select2-drop-active,
.select2-container-active .select2-choice,
.select2-container-active .select2-choices,
.select2-dropdown-open.select2-drop-above .select2-choice,
.select2-dropdown-open.select2-drop-above .select2-choices,
.select2-container-multi.select2-container-active .select2-choices
{
border: 1px solid #aaa;
}
.select2-drop-active
{
border: 1px solid #aaa;
border-top: none;
}
a span.select2-chosen
{
font-weight: normal !important;
}
/* ============================================================================== */
/* JMobile */