Commit 68760457 authored by Eirik Alvær's avatar Eirik Alvær

Improved checkboxes.

Removed tooltips.
Longer labels before ellipsis is used (40 chars)
Removed "inkluder fylkestall...".
Improved styling of alphabet navigator.
parent 4f633604
......@@ -8,6 +8,7 @@
<script src="//code.highcharts.com/highcharts.js" type="text/javascript" encoding="utf-8"></script>
<script src="//code.highcharts.com/highcharts-more.js" type="text/javascript" encoding="utf-8"></script>
<script src="build/spiderwidget/spiderwidget-min.js" type="text/javascript" encoding="utf-8"></script>
<script src="http://blacklabel.github.io/custom_events/customEvents.js" type="text/javascript" encoding="utf-8"></script>
<link rel="stylesheet" type="text/css" href="build/spiderwidget/spiderwidget.css"/>
<link rel="stylesheet" type="text/css" href="build/spiderwidget/red-theme.css"/>
......@@ -36,6 +37,7 @@
<section id="spiderweb"></section>
<section id="metadata"></section>
<section id="table"></section>
<div id="Metadatatooltips"></div>
</div>
</div>
......@@ -62,6 +64,9 @@
'metadata': {
'selector': '#metadata'
},
'metadatatooltips': {
'selector': '#Metadatatooltips'
},
'table': {
'selector': '#table'
}
......
......@@ -8,6 +8,7 @@
<script src="//code.highcharts.com/highcharts.js" type="text/javascript" encoding="utf-8"></script>
<script src="//code.highcharts.com/highcharts-more.js" type="text/javascript" encoding="utf-8"></script>
<script src="build/spiderwidget/spiderwidget-min.js" type="text/javascript" encoding="utf-8"></script>
<script src="http://blacklabel.github.io/custom_events/customEvents.js" type="text/javascript" encoding="utf-8"></script>
<link rel="stylesheet" type="text/css" href="build/spiderwidget/spiderwidget.css"/>
<link rel="stylesheet" type="text/css" href="build/spiderwidget/red-theme.css"/>
......@@ -30,7 +31,7 @@
<div class="bottomBorder">
<h1 class="negativeTopMargin">Kompetanseindikator</h1>
<div class="row">
<div class="col-sm-8">Sammenlign kompetanse i kommuner og fylker</div>
<div class="col-sm-8">Sammenlign kompetanse i kommuner og fylker</div>
</div>
</div>
<section id="spiderweb"></section>
......
......@@ -49,7 +49,7 @@ var Chart = (function (Highcharts, $, _) {
'min' : -100
},
'tooltip': {
'enabled': true,
'enabled': false,
'shared': true,
'useHTML': true,
positioner: function () {
......
......@@ -112,7 +112,7 @@ var Common = (function (_) {
},
formatLabel = function (label) {
var maxLength = 27;
var maxLength = 40;
if (label.length > maxLength) {
label = label.slice(0, maxLength).concat("..");
......
......@@ -336,9 +336,9 @@
$("ul.visible>li").each(function () {
var label = $(this).find("label").text().trim();
if (label.substring(0, 1).toLowerCase() !== letter.toLowerCase()) {
$(this).removeClass("visiable").addClass("hidden");
$(this).removeClass("visible").addClass("hidden");
} else {
$(this).removeClass("hidden").addClass("visiable");
$(this).removeClass("hidden").addClass("visible");
}
});
$('.alphabet .current').removeClass('current');
......@@ -390,10 +390,10 @@
event.preventDefault();
var span = $(this).find("span");
if ($(span).hasClass('icon-arrow_down')) {
$('.metadata .metadatacontent').removeClass("hidden").addClass("visiable");
$('.metadata .metadatacontent').removeClass("hidden").addClass("visible");
$(span).removeClass("icon-arrow_down").addClass("icon-arrow_up");
} else {
$('.metadata .metadatacontent').removeClass("visiable").addClass("hidden");
$('.metadata .metadatacontent').removeClass("visible").addClass("hidden");
$(span).removeClass("icon-arrow_up").addClass("icon-arrow_down");
}
});
......
......@@ -73,7 +73,6 @@
font-size: 18px;
text-align: center;
text-shadow: 0 1px 0 rgba(255, 255, 255, .5);
border-right: none;
text-decoration: none;
background-color: #F1F1F1;
}
......
......@@ -50,38 +50,4 @@ table.spiderwidget {
font-size: 110%;
box-shadow: 0 1px 2px rgba(0,0,0,0.05), inset 0px -15px 10px -12px rgba(0,0,0,0.05);
}
input[type='checkbox'] {
@include no-appearance;
top: -3px;
background-color: #fafafa;
border: 1px solid #0e708c;
display: inline-block;
position: relative;
padding: 4px;
box-shadow: 0 1px 2px rgba(0,0,0,0.05), inset 0px -15px 10px -12px rgba(0,0,0,0.05);
&:active, &:checked:active {
box-shadow: 0 1px 2px rgba(0,0,0,0.05), inset 0px 1px 3px rgba(0,0,0,0.1);
}
&:checked {
background-color: #0f7c9a;
border: 1px solid #0e708c;
box-shadow: 0 1px 2px rgba(0,0,0,0.05), inset 0px -15px 10px -12px rgba(0,0,0,0.05), inset 15px 10px -12px rgba(255,255,255,0.1);
color: #fafbfc;
&:after {
content: '\2714';
font-size: 14px;
position: absolute;
top: 0px;
left: 3px;
color: #fafbfc;
}
}
}
}
\ No newline at end of file
{{#each members}}
<li>
<li class="search-filter-item checkbox-item clearfix">
<input type="checkbox" name="controlmember" value="{{id}}" id="member-{{sanitizeId ../label}}-{{id}}" data-control-member-id="{{id}}" {{#if this.selected}} checked="checked"{{/if}}>
<label for="member-{{sanitizeId ../label}}-{{id}}">
{{label}}
<input type="checkbox" name="controlmember" value="{{id}}" id="member-{{sanitizeId ../label}}-{{id}}" data-control-member-id="{{id}}" {{#if this.selected}} checked="checked"{{/if}}>
<span class="icon-check search-filter-checked-label" aria-hidden="true"></span>
<span class="search-filter-unchecked-label"></span>
</label>
</li>
{{/each}}
\ No newline at end of file
......@@ -33,9 +33,6 @@
<a>&#216;</a>
<a class="last">&#xC5;</a>
</div>
<ul><li>
<label>inkluder fylkestall for kommunene du har valgt<input type="checkbox"></label>
</li></ul>
</div>
{{/if}}
{{#if useReferenceList}}
......
......@@ -112,7 +112,7 @@
</div>
<div class="col-sm-9">
<div style = "border-width: 2px;border-bottom-width:2px;border-bottom-color:#A1A1A1; border-bottom-style: solid;">
<div class="bottomBorder">
<h1 class="profile-thin search-result-page-title">Kompetanseindikator fylker</h1>
<div class="row">
<div class="col-sm-8">Diagrammet sammenlikner fylker med gjennomsnittet i Norge. Skår utenfor linjen «Hele landet» er bedre enn landsgjennomsnittet. Skår innenfor linjen «Hele landet» er dårligere. </div>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment