Permalink
Browse files

Merge pull request #1375 from leider/master

SVG Boost
  • Loading branch information...
NicoleRauch committed Nov 9, 2018
2 parents 007f7b6 + ffd8d29 commit f1c926d8dcf82b12b51be6b79d3270db53690c06
@@ -1,5 +1,7 @@
extends ../../../views/layout
include ../../groups/views/group-mixins
mixin activitylist(activities)
ul.list-unstyled
for activity in activities
@@ -10,20 +12,12 @@ mixin activitylist(activities)
span.popover-highlight(rel='tooltip-in-body', data-content=activity.descriptionHTML().substring(0,500))
a(href=activity.fullyQualifiedUrl()) #{activity.title()}
mixin placeGroupLabels(activities)
-var counter = {}
each activity in activities
-var group = activity.group
-counter[group.longName] = counter[group.longName] + 1 || 0;
if (group.shortName)
.badge.group.position-absolute(style='background-color: ' + activity.colorRGB + '; top: ' + ((group.mapYrelative() || 0) + (counter[group.longName] * 2)) + '%; left: ' + (group.mapXrelative() || 2) + '%;')
span(rel='tooltip-in-body', data-title='<h4>' + activity.title() + '</h4>', data-content=activity.descriptionHTML().substring(0,500))
a.group(href=activity.fullyQualifiedUrl()) #{group.shortName}
block title
| #{t('general.gdcr')} #{year}
block head
+addMapStyle
block content
.row
.col-12
@@ -35,10 +29,8 @@ block content
.row
.col-lg-6
+activitylist(activities)
.col-lg-6.d-inline.d-lg-none.groupsmap(style='position: relative; width: 100%; height: 100px; background-image:url("/img/map.svg"); background-size: 100% 100%; background-repeat: no-repeat;')
+placeGroupLabels(activities)
.col-lg-6.d-none.d-lg-inline.groupsmap(style='position: relative; width: 50%; height: 100px; background-image:url("/img/map.svg"); background-size: 100% 100%; background-repeat: no-repeat;')
+placeGroupLabels(activities)
.col-lg-6.groupsmap
+placeGroupLabelsForActivities(activities)
.row
.col-12
@@ -49,12 +41,7 @@ block content
block scripts
script.
function adjustMapsize() {
$('.groupsmap').each(function() {$(this).height(1.289 * $(this).width()); })
}
$(document).ready(adjustMapsize);
$.event.add(window, 'resize', adjustMapsize);
+adjustMapScript
if (activities.length > 0)
script.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -4,6 +4,9 @@ include group-mixins
block title
| #{t('groups.overview')}
block head
+addMapStyle
block content
.row
.col-12
@@ -16,16 +19,8 @@ block content
.col-lg-6
+grouplist(t('groups.regional'), regionalgroups)
+grouplist(t('groups.themed'), themegroups)
.col-lg-6.d-inline.d-lg-none.groupsmap(style='position: relative; width: 100%; height: 100px; background-image:url("/img/map.svg"); background-size: 100% 100%; background-repeat: no-repeat;')
+placeGroupLabels(regionalgroups)
.col-lg-6.d-none.d-lg-inline.groupsmap(style='position: relative; width: 50%; height: 100px; background-image:url("/img/map.svg"); background-size: 100% 100%; background-repeat: no-repeat;')
.col-lg-6.groupsmap
+placeGroupLabels(regionalgroups)
block scripts
script.
function adjustMapsize() {
$('.groupsmap').each(function() {$(this).height(1.289 * $(this).width()); })
}
$(document).ready(adjustMapsize);
$.event.add(window, 'resize', adjustMapsize);
+adjustMapScript
@@ -4,6 +4,10 @@ include ../../groups/views/group-mixins
block title
| #{t('general.welcome')}
block head
+addMapStyle
block content
.row
.col-12
@@ -32,9 +36,7 @@ block content
wie Clean Code, TDD etc. austauschen möchtest,
p Dann ist die Softwerkskammer etwas für Dich!
.col-lg-6.d-inline.d-lg-none.groupsmap(style='position: relative; width: 100%; height: 100px; background-image:url("/img/map.svg"); background-size: 100% 100%; background-repeat: no-repeat;')
+placeGroupLabels(regionalgroups)
.col-lg-6.d-none.d-lg-inline.groupsmap(style='position: relative; width: 50%; height: 100px; background-image:url("/img/map.svg"); background-size: 100% 100%; background-repeat: no-repeat;')
.col-lg-6.groupsmap
+placeGroupLabels(regionalgroups)
if (language === 'de')
.row
@@ -55,9 +57,4 @@ block content
| Wir wollen die richtige Software entwickeln, und wir wollen die Software richtig entwickeln.
block scripts
script.
function adjustMapsize() {
$('.groupsmap').each(function() {$(this).height(1.289 * $(this).width()); })
}
$(document).ready(adjustMapsize);
$.event.add(window, 'resize', adjustMapsize);
+adjustMapScript

This file was deleted.

Oops, something went wrong.
@@ -48,7 +48,7 @@ html
nav.navbar.navbar-expand-sm.p-0.navbar-light.bg-light.fixed-top.d-print-none(role='navigation')
+topNavbar
.container-fluid.p-0.p-md-auto
.row.main
.row.main.pb-4
block specific
+bottomNavbar

0 comments on commit f1c926d

Please sign in to comment.