Tags are shown as thumbs into card.
This commit is contained in:
parent
bfa0f0d576
commit
4db562c9e7
@ -160,7 +160,7 @@ foreach($fulltree as $key => $val)
|
||||
}
|
||||
|
||||
|
||||
print '<table class="liste" width="100%">';
|
||||
print '<table class="liste nohover" width="100%">';
|
||||
print '<tr class="liste_titre"><td>'.$langs->trans("Categories").'</td><td></td><td align="right">';
|
||||
if (! empty($conf->use_javascript_ajax))
|
||||
{
|
||||
|
||||
@ -4608,7 +4608,7 @@ class Form
|
||||
*
|
||||
* @param int $id Id of object
|
||||
* @param string $type Type of category ('member', 'customer', 'supplier', 'product', 'contact'). Old mode (0, 1, 2, ...) is deprecated.
|
||||
* @param int $rendermode 0=Default, use multiselect. 1=Use text with link
|
||||
* @param int $rendermode 0=Default, use multiselect. 1=Emulate multiselect
|
||||
* @return mixed Array of category objects or < 0 if KO
|
||||
*/
|
||||
function showCategories($id, $type, $rendermode=0)
|
||||
@ -4626,10 +4626,10 @@ class Form
|
||||
$ways = $c->print_all_ways();
|
||||
foreach($ways as $way)
|
||||
{
|
||||
$toprint[] = img_object('','category').' '.$way;
|
||||
$toprint[] = '<li class="select2-search-choice-dolibarr">'.img_object('','category').' '.$way.'</li>';
|
||||
}
|
||||
}
|
||||
return implode('<br>', $toprint);
|
||||
return '<div class="select2-container-multi-dolibarr" style="width: 90%;"><ul class="select2-choices-dolibarr">'.implode(' ', $toprint).'</ul></div>';
|
||||
}
|
||||
|
||||
if ($rendermode == 0)
|
||||
|
||||
@ -2204,7 +2204,7 @@ else
|
||||
print '</td></tr>';
|
||||
}
|
||||
|
||||
// Categories
|
||||
// Tags / categories
|
||||
if (! empty($conf->categorie->enabled) && ! empty($user->rights->categorie->lire))
|
||||
{
|
||||
print '<tr><td>' . $langs->trans( "Categories" ) . '</td>';
|
||||
|
||||
@ -2266,6 +2266,101 @@ div.jnotify-background {
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Select2 */
|
||||
/* ============================================================================== */
|
||||
|
||||
.selectoptiondisabledwhite {
|
||||
background: #FFFFFF !important;
|
||||
}
|
||||
|
||||
.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-disabled
|
||||
{
|
||||
color: #888;
|
||||
}
|
||||
.select2-drop-active
|
||||
{
|
||||
border: 1px solid #aaa;
|
||||
border-top: none;
|
||||
}
|
||||
a span.select2-chosen
|
||||
{
|
||||
font-weight: normal !important;
|
||||
}
|
||||
.select2-container .select2-choice {
|
||||
background-image: none;
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
}
|
||||
.select2-choices .select2-search-choice {
|
||||
border: 1px solid #aaa !important;
|
||||
}
|
||||
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
|
||||
{
|
||||
background: #FFFFFF;
|
||||
}
|
||||
.select2-container-multi.select2-container-disabled .select2-choices {
|
||||
background-color: #FFFFFF;
|
||||
background-image: none;
|
||||
border: none;
|
||||
cursor: default;
|
||||
}
|
||||
.select2-container-multi .select2-choices .select2-search-choice {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
/* To emulate select 2 style */
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
|
||||
padding: 2px 5px 1px 5px;
|
||||
margin: 0 0 2px 3px;
|
||||
position: relative;
|
||||
line-height: 13px;
|
||||
color: #333;
|
||||
cursor: default;
|
||||
border: 1px solid #aaaaaa;
|
||||
border-radius: 3px;
|
||||
-webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
background-clip: padding-box;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
background-color: #e4e4e4;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
|
||||
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
|
||||
background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
|
||||
font-weight: normal;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr li {
|
||||
float: left;
|
||||
list-style: none;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr {
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
margin: 0;
|
||||
padding: 0 5px 0 0;
|
||||
position: relative;
|
||||
cursor: text;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* JMobile */
|
||||
/* ============================================================================== */
|
||||
|
||||
@ -2440,6 +2440,101 @@ div.ecmjqft {
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Select2 */
|
||||
/* ============================================================================== */
|
||||
|
||||
.selectoptiondisabledwhite {
|
||||
background: #FFFFFF !important;
|
||||
}
|
||||
|
||||
.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-disabled
|
||||
{
|
||||
color: #888;
|
||||
}
|
||||
.select2-drop-active
|
||||
{
|
||||
border: 1px solid #aaa;
|
||||
border-top: none;
|
||||
}
|
||||
a span.select2-chosen
|
||||
{
|
||||
font-weight: normal !important;
|
||||
}
|
||||
.select2-container .select2-choice {
|
||||
background-image: none;
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
}
|
||||
.select2-choices .select2-search-choice {
|
||||
border: 1px solid #aaa !important;
|
||||
}
|
||||
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
|
||||
{
|
||||
background: #FFFFFF;
|
||||
}
|
||||
.select2-container-multi.select2-container-disabled .select2-choices {
|
||||
background-color: #FFFFFF;
|
||||
background-image: none;
|
||||
border: none;
|
||||
cursor: default;
|
||||
}
|
||||
.select2-container-multi .select2-choices .select2-search-choice {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
/* To emulate select 2 style */
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
|
||||
padding: 2px 5px 1px 5px;
|
||||
margin: 0 0 2px 3px;
|
||||
position: relative;
|
||||
line-height: 13px;
|
||||
color: #333;
|
||||
cursor: default;
|
||||
border: 1px solid #aaaaaa;
|
||||
border-radius: 3px;
|
||||
-webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
background-clip: padding-box;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
background-color: #e4e4e4;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
|
||||
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
|
||||
background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
|
||||
font-weight: normal;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr li {
|
||||
float: left;
|
||||
list-style: none;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr {
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
margin: 0;
|
||||
padding: 0 5px 0 0;
|
||||
position: relative;
|
||||
cursor: text;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* JMobile */
|
||||
/* ============================================================================== */
|
||||
|
||||
@ -2625,6 +2625,101 @@ div.ecmjqft {
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Select2 */
|
||||
/* ============================================================================== */
|
||||
|
||||
.selectoptiondisabledwhite {
|
||||
background: #FFFFFF !important;
|
||||
}
|
||||
|
||||
.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-disabled
|
||||
{
|
||||
color: #888;
|
||||
}
|
||||
.select2-drop-active
|
||||
{
|
||||
border: 1px solid #aaa;
|
||||
border-top: none;
|
||||
}
|
||||
a span.select2-chosen
|
||||
{
|
||||
font-weight: normal !important;
|
||||
}
|
||||
.select2-container .select2-choice {
|
||||
background-image: none;
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
}
|
||||
.select2-choices .select2-search-choice {
|
||||
border: 1px solid #aaa !important;
|
||||
}
|
||||
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
|
||||
{
|
||||
background: #FFFFFF;
|
||||
}
|
||||
.select2-container-multi.select2-container-disabled .select2-choices {
|
||||
background-color: #FFFFFF;
|
||||
background-image: none;
|
||||
border: none;
|
||||
cursor: default;
|
||||
}
|
||||
.select2-container-multi .select2-choices .select2-search-choice {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
/* To emulate select 2 style */
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
|
||||
padding: 2px 5px 1px 5px;
|
||||
margin: 0 0 2px 3px;
|
||||
position: relative;
|
||||
line-height: 13px;
|
||||
color: #333;
|
||||
cursor: default;
|
||||
border: 1px solid #aaaaaa;
|
||||
border-radius: 3px;
|
||||
-webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
background-clip: padding-box;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
background-color: #e4e4e4;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
|
||||
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
|
||||
background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
|
||||
font-weight: normal;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr li {
|
||||
float: left;
|
||||
list-style: none;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr {
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
margin: 0;
|
||||
padding: 0 5px 0 0;
|
||||
position: relative;
|
||||
cursor: text;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* JMobile */
|
||||
/* ============================================================================== */
|
||||
|
||||
@ -195,7 +195,7 @@ legend { margin-bottom: 8px; }
|
||||
}
|
||||
.buttonRefused {
|
||||
pointer-events: none;
|
||||
cursor: default;
|
||||
cursor: default;
|
||||
opacity: 0.4;
|
||||
filter: alpha(opacity=40); /* For IE8 and earlier */
|
||||
box-shadow: none;
|
||||
@ -2505,6 +2505,102 @@ div.ecmjqft {
|
||||
background-image: none;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* Select2 */
|
||||
/* ============================================================================== */
|
||||
|
||||
.selectoptiondisabledwhite {
|
||||
background: #FFFFFF !important;
|
||||
}
|
||||
|
||||
.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-disabled
|
||||
{
|
||||
color: #888;
|
||||
}
|
||||
.select2-drop-active
|
||||
{
|
||||
border: 1px solid #aaa;
|
||||
border-top: none;
|
||||
}
|
||||
a span.select2-chosen
|
||||
{
|
||||
font-weight: normal !important;
|
||||
}
|
||||
.select2-container .select2-choice {
|
||||
background-image: none;
|
||||
height: 24px;
|
||||
line-height: 24px;
|
||||
}
|
||||
.select2-choices .select2-search-choice {
|
||||
border: 1px solid #aaa !important;
|
||||
}
|
||||
.select2-results .select2-no-results, .select2-results .select2-searching, .select2-results .select2-ajax-error, .select2-results .select2-selection-limit
|
||||
{
|
||||
background: #FFFFFF;
|
||||
}
|
||||
.select2-container-multi.select2-container-disabled .select2-choices {
|
||||
background-color: #FFFFFF;
|
||||
background-image: none;
|
||||
border: none;
|
||||
cursor: default;
|
||||
}
|
||||
.select2-container-multi .select2-choices .select2-search-choice {
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
/* To emulate select 2 style */
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
|
||||
padding: 2px 5px 1px 5px;
|
||||
margin: 0 0 2px 3px;
|
||||
position: relative;
|
||||
line-height: 13px;
|
||||
color: #333;
|
||||
cursor: default;
|
||||
border: 1px solid #aaaaaa;
|
||||
border-radius: 3px;
|
||||
-webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
background-clip: padding-box;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
background-color: #e4e4e4;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
|
||||
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
|
||||
background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
|
||||
font-weight: normal;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr li {
|
||||
float: left;
|
||||
list-style: none;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr {
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
margin: 0;
|
||||
padding: 0 5px 0 0;
|
||||
position: relative;
|
||||
cursor: text;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
/* JMobile */
|
||||
/* ============================================================================== */
|
||||
|
||||
@ -3394,8 +3394,50 @@ a span.select2-chosen
|
||||
cursor: default;
|
||||
}
|
||||
.select2-container-multi .select2-choices .select2-search-choice {
|
||||
margin-bottom: 2px;
|
||||
margin-bottom: 3px;
|
||||
}
|
||||
/* To emulate select 2 style */
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr {
|
||||
padding: 2px 5px 1px 5px;
|
||||
margin: 0 0 2px 3px;
|
||||
position: relative;
|
||||
line-height: 13px;
|
||||
color: #333;
|
||||
cursor: default;
|
||||
border: 1px solid #aaaaaa;
|
||||
border-radius: 3px;
|
||||
-webkit-box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
box-shadow: 0 0 2px #fff inset, 0 1px 0 rgba(0, 0, 0, 0.05);
|
||||
background-clip: padding-box;
|
||||
-webkit-touch-callout: none;
|
||||
-webkit-user-select: none;
|
||||
-moz-user-select: none;
|
||||
-ms-user-select: none;
|
||||
user-select: none;
|
||||
background-color: #e4e4e4;
|
||||
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#f4f4f4', GradientType=0);
|
||||
background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eee));
|
||||
background-image: -webkit-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: -moz-linear-gradient(top, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
background-image: linear-gradient(to bottom, #f4f4f4 20%, #f0f0f0 50%, #e8e8e8 52%, #eee 100%);
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr .select2-search-choice-dolibarr a {
|
||||
font-weight: normal;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr li {
|
||||
float: left;
|
||||
list-style: none;
|
||||
}
|
||||
.select2-container-multi-dolibarr .select2-choices-dolibarr {
|
||||
height: auto !important;
|
||||
height: 1%;
|
||||
margin: 0;
|
||||
padding: 0 5px 0 0;
|
||||
position: relative;
|
||||
cursor: text;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* ============================================================================== */
|
||||
|
||||
Loading…
Reference in New Issue
Block a user