Endringer på parten

statisticsnorway · Mar 7, 2025 · 459dcca · 459dcca
1 parent ae604a5
commit 459dcca
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/src/main/resources/assets/styles/_timeline.scss b/src/main/resources/assets/styles/_timeline.scss
@@ -3,6 +3,7 @@
     display: grid;
     grid-template-columns: repeat(12, 1fr);
     margin-top: 4rem;
+    margin-bottom: 5rem;
 
     .title-ingress-wrapper {
       grid-column: 2 / span 10;
@@ -28,7 +29,6 @@
       grid-column: 3 / span 8;
       flex-wrap: wrap;
       gap: 0.75rem;
-      margin-top: 5rem;
       margin-bottom: 4rem;
       width: 740px;
 

diff --git a/src/main/resources/lib/types/partTypes/timeline.ts b/src/main/resources/lib/types/partTypes/timeline.ts
@@ -2,6 +2,7 @@ export interface TimelineProps {
   title: string
   ingress: string
   timelineElements: TimelineElement[]
+  showFilter: boolean
   showMoreButtonText: string
   countYear: number
 }

diff --git a/src/main/resources/site/parts/timeline/timeline.ts b/src/main/resources/site/parts/timeline/timeline.ts
@@ -50,6 +50,7 @@ function renderPart(req: XP.Request) {
     title: timelineConfig.title,
     ingress: timelineConfig.ingress,
     timelineElements,
+    showFilter: timelineConfig.showFilter,
     showMoreButtonText: showMoreText ?? 'Vis flere år',
     countYear: timelineConfig.numberOfYear ?? 10,
   }

diff --git a/src/main/resources/site/parts/timeline/timeline.tsx b/src/main/resources/site/parts/timeline/timeline.tsx
@@ -15,7 +15,7 @@ import { sanitize } from '/lib/ssb/utils/htmlUtils'
 import { usePaginationKeyboardNavigation } from '/lib/ssb/utils/customHooks/paginationHooks'
 
 function Timeline(props: TimelineProps) {
-  const { timelineElements, countYear, showMoreButtonText, title, ingress } = props
+  const { timelineElements, countYear, showMoreButtonText, title, ingress, showFilter } = props
   const [selectedTag, setSelectedTag] = useState('all')
   const [timelineCount, setTimeLineCount] = useState(countYear)
   const [keyboardNavigation, setKeyboardNavigation] = useState(false)
@@ -251,7 +251,7 @@ function Timeline(props: TimelineProps) {
   return (
     <div className='ssb-timeline'>
       {title && addTitle()}
-      {addFilter()}
+      {showFilter && addFilter()}
       {addTimeLine()}
     </div>
   )

diff --git a/src/main/resources/site/parts/timeline/timeline.xml b/src/main/resources/site/parts/timeline/timeline.xml
@@ -12,6 +12,12 @@
                     <label>Ingress</label>
                     <occurrences minimum="0" maximum="1"/>  
                 </input>
+                <input  name="showFilter" type="CheckBox">
+                    <label>Vis filtering</label>
+                    <config>
+                        <alignment>right</alignment>  
+                    </config>
+                </input>
                 <input type="TextLine" name="numberOfYear">
                     <label>Antall år per side</label>
                     <help-text>Hvor mange år skal vises før man må trykke Vis flere år</help-text>
@@ -21,7 +27,7 @@
             </items>
         </field-set>
         <item-set name="TimelineItemSet">  
-            <label>Tidslinjeelementer</label>  
+            <label>Vimpel</label>  
             <occurrences minimum="1" maximum="0"/>  
             <items>
                 <input name="year" type="TextLine">