Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MIM-933] MIM-933 #2272

Merged
merged 2 commits into from
Nov 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/main/resources/assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,12 @@ section.part-divider + section.part-divider {
padding-bottom: 20px;
}

.region-dark-grey {
background-color: $ssb-dark-5;
padding-top: 20px;
padding-bottom: 20px;
}

.premain {
max-width: 100%;
background: white;
Expand Down Expand Up @@ -145,4 +151,4 @@ section.part-divider + section.part-divider {
h2 {
color: $ssb-red-3;
}
}
}
2 changes: 1 addition & 1 deletion src/main/resources/site/pages/default/default.html
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ <h1 data-th-text="${page.displayName}"></h1>
data-th-unless="${statbankWeb}"
>
<div data-th-if="${region.showGreyTriangle}" class="grey-triangle"></div>
<div data-th-classappend="${region.showGreyBackground ? 'region-grey' : (region.topBorder ? 'border-columns' : '')}">
<div data-th-classappend="${region.showDarkGreyBackground ? 'region-dark-grey' : (region.showGreyBackground ? 'region-grey' : (region.topBorder ? 'border-columns' : ''))}">
<div
data-th-classappend="${region.view == 'full' ? 'container-fluid p-0' : region.view == 'card' ? 'border-top-green container' : 'container'}"
>
Expand Down
85 changes: 44 additions & 41 deletions src/main/resources/site/pages/default/default.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<form>
<input name="pageType" type="RadioButton">
<label>Sidetype</label>
<occurrences minimum="1" maximum="1"/>
<occurrences minimum="1" maximum="1" />
<config>
<option value="default">Standard</option>
<option value="municipality">Kommunefakta</option>
Expand All @@ -16,7 +16,7 @@
<items>
<input name="subjectType" type="RadioButton">
<label>Hovedemne eller Delemne</label>
<occurrences minimum="0" maximum="1"/>
<occurrences minimum="0" maximum="1" />
<config>
<option value="mainSubject">Hovedemne</option>
<option value="subSubject">Delemne</option>
Expand All @@ -25,30 +25,30 @@
<input type="TextLine" name="subjectCode">
<label>Emnekode</label>
<help-text>Hvert hovedemne og delemne har en kode, finner det i emnestrukturen i 4.7</help-text>
<occurrences minimum="0" maximum="1"/>
<occurrences minimum="0" maximum="1" />
</input>
</items>
</field-set>
<input name="hide_breadcrumb" type="CheckBox">
<label>Skjul Brødsmulesti</label>
</input>
<input name="bkg_color" type="RadioButton">
<label>Velg bakgrunnsfarge</label>
<occurrences minimum="1" maximum="1"/>
<config>
<option value="white">Hvit</option>
<option value="grey">Grå</option>
<input name="bkg_color" type="RadioButton">
<label>Velg bakgrunnsfarge</label>
<occurrences minimum="1" maximum="1" />
<config>
<option value="white">Hvit</option>
<option value="grey">Grå</option>
</config>
<default>white</default>
</input>
<item-set name="regions">
<label>Region</label>
<occurrences minimum="1" maximum="26"/>
<occurrences minimum="1" maximum="26" />
<items>
<mixin name="title"/>
<mixin name="title" />
<input name="view" type="RadioButton">
<label>Visningstype</label>
<occurrences minimum="1" maximum="1"/>
<occurrences minimum="1" maximum="1" />
<config>
<option value="full">Full bredde</option>
<option value="card">Seksjon med grønn stripe</option>
Expand All @@ -57,7 +57,7 @@
</input>
<input name="region" type="ComboBox">
<label>Region</label>
<occurrences minimum="1" maximum="1"/>
<occurrences minimum="1" maximum="1" />
<config>
<option value="Rad_A">Rad A</option>
<option value="Rad_B">Rad B</option>
Expand Down Expand Up @@ -93,39 +93,42 @@
<input name="showGreyBackground" type="CheckBox">
<label>Grå bakgrunn på region</label>
</input>
<input name="showDarkGreyBackground" type="CheckBox">
<label>Mørk grå bakgrunn på region</label>
</input>
<input name="topBorder" type="CheckBox">
<label>Toppramme</label>
</input>
</items>
</item-set>
</form>
<regions>
<region name="Rad_A"/>
<region name="Rad_B"/>
<region name="Rad_C"/>
<region name="Rad_D"/>
<region name="Rad_E"/>
<region name="Rad_F"/>
<region name="Rad_G"/>
<region name="Rad_H"/>
<region name="Rad_I"/>
<region name="Rad_J"/>
<region name="Rad_K"/>
<region name="Rad_L"/>
<region name="Rad_M"/>
<region name="Rad_N"/>
<region name="Rad_O"/>
<region name="Rad_P"/>
<region name="Rad_Q"/>
<region name="Rad_R"/>
<region name="Rad_S"/>
<region name="Rad_T"/>
<region name="Rad_U"/>
<region name="Rad_V"/>
<region name="Rad_W"/>
<region name="Rad_X"/>
<region name="Rad_Y"/>
<region name="Rad_Z"/>
<region name="main"/>
<region name="Rad_A" />
<region name="Rad_B" />
<region name="Rad_C" />
<region name="Rad_D" />
<region name="Rad_E" />
<region name="Rad_F" />
<region name="Rad_G" />
<region name="Rad_H" />
<region name="Rad_I" />
<region name="Rad_J" />
<region name="Rad_K" />
<region name="Rad_L" />
<region name="Rad_M" />
<region name="Rad_N" />
<region name="Rad_O" />
<region name="Rad_P" />
<region name="Rad_Q" />
<region name="Rad_R" />
<region name="Rad_S" />
<region name="Rad_T" />
<region name="Rad_U" />
<region name="Rad_V" />
<region name="Rad_W" />
<region name="Rad_X" />
<region name="Rad_Y" />
<region name="Rad_Z" />
<region name="main" />
</regions>
</page>
</page>