Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MaarchCourrier
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Redmine
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Harbor Registry
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Maarch
MaarchCourrier
Commits
7c8d9137
Verified
Commit
7c8d9137
authored
6 years ago
by
Alex ORLUC
Browse files
Options
Downloads
Patches
Plain Diff
FEAT #8956 add color cat group
parent
60f81622
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/frontend/app/list/filters/filters-tool.component.html
+8
-8
8 additions, 8 deletions
src/frontend/app/list/filters/filters-tool.component.html
src/frontend/app/list/filters/filters-tool.component.scss
+11
-10
11 additions, 10 deletions
src/frontend/app/list/filters/filters-tool.component.scss
with
19 additions
and
18 deletions
src/frontend/app/list/filters/filters-tool.component.html
+
8
−
8
View file @
7c8d9137
<mat-button-toggle-group
#group
="
matButtonToggleGroup
"
class=
"envFilter"
multiple
>
<mat-button-toggle-group
#group
="
matButtonToggleGroup
"
class=
"envFilter"
multiple
>
<mat-checkbox
color=
"primary"
style=
"margin: 10px;"
title=
"Sélectionner tous les courriers de la bannette"
></mat-checkbox>
<mat-checkbox
color=
"primary"
style=
"margin: 10px;"
title=
"Sélectionner tous les courriers de la bannette"
></mat-checkbox>
<form
[formGroup]=
"stateForm"
>
<form
[formGroup]=
"stateForm"
[style.width.px]=
"300"
>
<mat-form-field
appearance=
"outline"
floatLabel=
"never"
[style.fontSize.px]=
"10"
>
<mat-form-field
appearance=
"outline"
floatLabel=
"never"
[style.fontSize.px]=
"10"
>
<input
class=
"metaSearch"
type=
"text"
matInput
placeholder=
"Recherche un document"
formControlName=
"stateGroup"
<input
class=
"metaSearch"
type=
"text"
matInput
placeholder=
"Recherche un document"
formControlName=
"stateGroup"
[matAutocomplete]=
"autoGroup"
(focus)=
"initFilters()"
(keyup.enter)=
"metaSearch($event);"
>
[matAutocomplete]=
"autoGroup"
(focus)=
"initFilters()"
(keyup.enter)=
"metaSearch($event);"
>
...
@@ -13,8 +13,8 @@
...
@@ -13,8 +13,8 @@
<mat-optgroup
*ngIf=
"group.names.length > 0"
[label]=
"group.letter"
>
<mat-optgroup
*ngIf=
"group.names.length > 0"
[label]=
"group.letter"
>
<mat-option
*ngFor=
"let name of group.names"
[value]=
"name"
>
<mat-option
*ngFor=
"let name of group.names"
[value]=
"name"
>
<span
[class.undefined]=
"name.label === '_UNDEFINED'"
style=
"flex:1;overflow: hidden;text-overflow: ellipsis;"
>
{{name.label}}
</span>
<span
[class.undefined]=
"name.label === '_UNDEFINED'"
style=
"flex:1;overflow: hidden;text-overflow: ellipsis;"
>
{{name.label}}
</span>
<span>
<span
class=
"filterBadges"
>
<span
bgcolor=
"warn"
class=
"badge
"
style=
"min-width:auto;"
>
{{name.count}}
</span>
<span
class=
"badge badge-{{name.id}}
"
style=
"min-width:auto;"
>
{{name.count}}
</span>
</span>
</span>
</mat-option>
</mat-option>
</mat-optgroup>
</mat-optgroup>
...
@@ -60,14 +60,14 @@
...
@@ -60,14 +60,14 @@
</mat-menu>
</mat-menu>
</mat-button-toggle-group>
</mat-button-toggle-group>
<div
class=
"filterBadges"
>
<div
class=
"filterBadges"
>
<span
class=
"label badge-
meta
"
*ngIf=
"this.listProperties.search !== ''"
title=
"{{lang.subject}} / {{lang.chronoNumber}}"
>
{{this.listProperties.search}}
<span
class=
"label badge-
search
"
*ngIf=
"this.listProperties.search !== ''"
title=
"{{lang.subject}} / {{lang.chronoNumber}}"
>
{{this.listProperties.search}}
<i
class=
"fa fa-times-circle"
(click)=
"this.listProperties.search='';updateFilters();"
></i></span>
<i
class=
"fa fa-times-circle"
(click)=
"this.listProperties.search='';updateFilters();"
></i></span>
<span
class=
"label badge-cat"
title=
"{{lang.categories}}"
*ngFor=
"let category of this.listProperties.categories; let i=index"
>
{{category.label}}
<span
class=
"label badge-cat
egories
"
title=
"{{lang.categories}}"
*ngFor=
"let category of this.listProperties.categories; let i=index"
>
{{category.label}}
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('categories', i)"
></i></span>
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('categories', i)"
></i></span>
<span
class=
"label badge-prio"
title=
"{{lang.priorities}}"
*ngFor=
"let priority of this.listProperties.priorities; let i=index"
>
{{priority.label}}
<span
class=
"label badge-prio
rities
"
title=
"{{lang.priorities}}"
*ngFor=
"let priority of this.listProperties.priorities; let i=index"
>
{{priority.label}}
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('priorities', i)"
></i></span>
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('priorities', i)"
></i></span>
<span
class=
"label badge-stat"
title=
"{{lang.statuses}}"
*ngFor=
"let status of this.listProperties.statuses; let i=index"
>
{{status.label}}
<span
class=
"label badge-stat
uses
"
title=
"{{lang.statuses}}"
*ngFor=
"let status of this.listProperties.statuses; let i=index"
>
{{status.label}}
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('statuses', i)"
></i></span>
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('statuses', i)"
></i></span>
<span
class=
"label badge-ent"
title=
"{{lang.entities}}"
*ngFor=
"let entity of this.listProperties.entities; let i=index"
>
{{entity.label}}
<span
class=
"label badge-ent
ities
"
title=
"{{lang.entities}}"
*ngFor=
"let entity of this.listProperties.entities; let i=index"
>
{{entity.label}}
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('entities', i)"
></i></span>
<i
class=
"fa fa-times-circle"
(click)=
"removeFilter('entities', i)"
></i></span>
</div>
</div>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/frontend/app/list/filters/filters-tool.component.scss
+
11
−
10
View file @
7c8d9137
...
@@ -10,31 +10,37 @@
...
@@ -10,31 +10,37 @@
color
:
white
;
color
:
white
;
}
}
}
}
.filterBadges
>
.badge-meta
{
.mat-option
.badge
{
background
:
#F99830
;
font-size
:
11px
;
}
.filterBadges
>
.badge-search
{
margin
:
5px
;
margin
:
5px
;
background
:
#666
;
background
:
#666
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.filterBadges
>
.badge-cat
{
.filterBadges
>
.badge-cat
egories
{
margin
:
5px
;
margin
:
5px
;
background
:
#78AD32
;
background
:
#78AD32
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.filterBadges
>
.badge-stat
{
.filterBadges
>
.badge-stat
uses
{
margin
:
5px
;
margin
:
5px
;
background
:
#5bc0de
;
background
:
#5bc0de
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.filterBadges
>
.badge-prio
{
.filterBadges
>
.badge-prio
rities
{
margin
:
5px
;
margin
:
5px
;
background
:
#F9D812
;
background
:
#F9D812
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.filterBadges
>
.badge-ent
{
.filterBadges
>
.badge-ent
ities
{
margin
:
5px
;
margin
:
5px
;
background
:
#7d5ba6
;
background
:
#7d5ba6
;
cursor
:
pointer
;
cursor
:
pointer
;
...
@@ -49,11 +55,6 @@
...
@@ -49,11 +55,6 @@
background
:
inherit
!
important
;
background
:
inherit
!
important
;
}
}
.mat-option
.badge
{
background
:
#F99830
;
font-size
:
11px
;
}
.mat-option-text
{
.mat-option-text
{
display
:
flex
!
important
;
display
:
flex
!
important
;
overflow
:
inherit
!
important
;
overflow
:
inherit
!
important
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment