Fixed #894

primefaces · May 20, 2019 · 1baaa78 · 1baaa78
1 parent 87869fb
commit 1baaa78
Show file tree

Hide file tree

Showing 11 changed files with 204 additions and 11 deletions.
diff --git a/public/resources/themes/luna-amber/theme.css b/public/resources/themes/luna-amber/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #212121;
   background-color: #FFB300;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;

diff --git a/public/resources/themes/luna-blue/theme.css b/public/resources/themes/luna-blue/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #1f7ed0;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;

diff --git a/public/resources/themes/luna-green/theme.css b/public/resources/themes/luna-green/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #1ea04c;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;

diff --git a/public/resources/themes/luna-pink/theme.css b/public/resources/themes/luna-pink/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #cc285c;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #191919;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #3f3f3f;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #4c4c4c;
   color: #dedede;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #252525;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #4c4c4c;
   color: #dedede;

diff --git a/public/resources/themes/nova-colored/theme.css b/public/resources/themes/nova-colored/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #007ad9;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #eaeaea;
   color: #333333;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #007ad9;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #eaeaea;
   color: #333333;

diff --git a/public/resources/themes/nova-dark/theme.css b/public/resources/themes/nova-dark/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #007ad9;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #eaeaea;
   color: #333333;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #007ad9;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #eaeaea;
   color: #333333;

diff --git a/public/resources/themes/nova-light/theme.css b/public/resources/themes/nova-light/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #007ad9;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #a6a6a6;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #eaeaea;
   color: #333333;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #007ad9;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #eaeaea;
   color: #333333;

diff --git a/public/resources/themes/rhea/theme.css b/public/resources/themes/rhea/theme.css
@@ -940,6 +940,9 @@ body .p-datepicker table {
 body .p-datepicker table th {
   padding: 0.5em;
 }
+body .p-datepicker table th.p-datepicker-weekheader {
+  border-right: 1px solid #dadada;
+}
 body .p-datepicker table td {
   padding: 0.5em;
 }
@@ -965,6 +968,9 @@ body .p-datepicker table td.p-datepicker-today > span.p-highlight {
   color: #ffffff;
   background-color: #7B95A3;
 }
+body .p-datepicker table td.p-datepicker-weeknumber {
+  border-right: 1px solid #dadada;
+}
 body .p-datepicker .p-datepicker-buttonbar {
   border-top: 1px solid #d8dae2;
 }
@@ -2584,6 +2590,17 @@ body .p-tree.p-tree-horizontal .p-treenode .p-treenode-content.p-treenode-select
   background-color: #f4f4f4;
   color: #666666;
 }
+body .p-tree .p-tree-filter-container .p-tree-filter {
+  width: 100%;
+  padding-right: 2em;
+}
+body .p-tree .p-tree-filter-container .p-tree-filter-icon {
+  top: 50%;
+  left: auto;
+  margin-top: -0.5em;
+  right: 0.8em;
+  color: #a6a6a6;
+}
 body .p-organizationchart .p-organizationchart-node-content.p-organizationchart-selectable-node:not(.p-highlight):hover {
   background-color: #f4f4f4;
   color: #666666;

diff --git a/src/components/calendar/Calendar.d.ts b/src/components/calendar/Calendar.d.ts
@@ -53,6 +53,7 @@ interface CalendarProps {
     stepSecond?: number;
     shortYearCutoff?: string;
     hideOnDateTimeSelect?: boolean;
+    showWeek: PropTypes.bool,
     locale?: LocaleSettings;
     dateFormat?: string;
     panelStyle?: object;