diff --git a/djnro/static/css/style.css b/djnro/static/css/style.css index 45cc729e..2893e521 100644 --- a/djnro/static/css/style.css +++ b/djnro/static/css/style.css @@ -143,3 +143,7 @@ input[readonly].input { .btn-link { padding-top: 15px; } + +dd.preproduction { + color: rgb(230, 93, 0); +} diff --git a/djnro/static/img/edupin-preprod.png b/djnro/static/img/edupin-preprod.png new file mode 100644 index 00000000..ee84cc26 Binary files /dev/null and b/djnro/static/img/edupin-preprod.png differ diff --git a/djnro/static/img/edupin.png b/djnro/static/img/edupin.png index 3c9c9384..6ef0ff6a 100644 Binary files a/djnro/static/img/edupin.png and b/djnro/static/img/edupin.png differ diff --git a/djnro/static/img/edupin.svg b/djnro/static/img/edupin.svg new file mode 100644 index 00000000..4e566544 --- /dev/null +++ b/djnro/static/img/edupin.svg @@ -0,0 +1,172 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/djnro/static/js/geolocate.js b/djnro/static/js/geolocate.js index 89b3eec5..b91a1345 100644 --- a/djnro/static/js/geolocate.js +++ b/djnro/static/js/geolocate.js @@ -20,9 +20,11 @@ function initialize() { image = new google.maps.MarkerImage(pinImg, - new google.maps.Size(29, 40), + new google.maps.Size(50, 80), new google.maps.Point(0, 0), - new google.maps.Point(14, 40) + // The anchor for this image is the base of the flagpole at 18,42. + new google.maps.Point(12, 40), + new google.maps.Size(25, 40) ); var styleArray = [{ featureType : "all", diff --git a/djnro/static/js/home-page-map.js b/djnro/static/js/home-page-map.js index ada80df6..6c4e0871 100644 --- a/djnro/static/js/home-page-map.js +++ b/djnro/static/js/home-page-map.js @@ -5,21 +5,29 @@ var map; var bounds; var image; + var imagePreProd; var infoWindow; var cityImg; var countryImg; var styles; var markersUrl; var pinImg; + var pinImgPreProd; function initialize() { image = new google.maps.MarkerImage(pinImg, - // This marker is 29 pixels wide by 40 pixels tall. - new google.maps.Size(29, 40), - // The origin for this image is 0,0. - new google.maps.Point(0, 0), - // The anchor for this image is the base of the flagpole at 18,42. - new google.maps.Point(14, 40)); + new google.maps.Size(50, 80), + new google.maps.Point(0, 0), + // The anchor for this image is the base of the flagpole at 18,42. + new google.maps.Point(12, 40), + new google.maps.Size(25, 40) + ); + imagePreProd = new google.maps.MarkerImage(pinImgPreProd, + new google.maps.Size(50, 80), + new google.maps.Point(0, 0), + new google.maps.Point(12, 40), + new google.maps.Size(25, 40) + ); var styleArray = [ { featureType : "all", @@ -126,12 +134,10 @@ marker, 'click', function() { - infoWindow.setContent ( "

" + infoWindow.setContent ( "

" + jsonMarker.inst + "

" - + - - "
" + + "
" + "
    " + "
  • Info
    • " + "
  • More...
    • " @@ -153,7 +159,9 @@ + " " + "
    Number of APs
    " + jsonMarker.AP_no - + " 
    " + + " " + + (jsonMarker.stage == 1 ? '' : '
    Stage
    Testing/Preproduction
    ') + + "" + "
" + "
" + "
" @@ -203,7 +211,7 @@ 'map' : map, 'title' : title, 'address' : address, - 'icon' : pinImg, + 'icon' : markerObj.stage == 1 ? image : imagePreProd, }); return marker } @@ -350,6 +358,7 @@ image = ''; infoWindow; pinImg = mapDiv.data("pin"); + pinImgPreProd = mapDiv.data("pin-preprod"); pinGrpImg = mapDiv.data("group-pin"); addr = {}; styles = [{ diff --git a/djnro/static/js/management-map.js b/djnro/static/js/management-map.js index 4dda154b..c4081331 100644 --- a/djnro/static/js/management-map.js +++ b/djnro/static/js/management-map.js @@ -13,13 +13,12 @@ var servicesEditUrl; function initialize() { image = new google.maps.MarkerImage(pinImg, - // This marker is 29 pixels wide by 40 pixels tall. - new google.maps.Size(29, 40), - // The origin for this image is 0,0. - new google.maps.Point(0,0), - // The anchor for this image is the base of the flagpole at 18,42. - new google.maps.Point(14, 40) -); + new google.maps.Size(50, 80), + new google.maps.Point(0, 0), + // The anchor for this image is the base of the flagpole at 18,42. + new google.maps.Point(12, 40), + new google.maps.Size(25, 40) + ); var styleArray = [ { featureType: "all", diff --git a/djnro/static/js/world-map.js b/djnro/static/js/world-map.js index a24b1036..a7e781af 100644 --- a/djnro/static/js/world-map.js +++ b/djnro/static/js/world-map.js @@ -15,12 +15,12 @@ function initialize() { image = new google.maps.MarkerImage(pinImg, - // This marker is 29 pixels wide by 40 pixels tall. - new google.maps.Size(29, 40), - // The origin for this image is 0,0. - new google.maps.Point(0, 0), - // The anchor for this image is the base of the flagpole at 18,42. - new google.maps.Point(14, 40)); + new google.maps.Size(50, 80), + new google.maps.Point(0, 0), + // The anchor for this image is the base of the flagpole at 18,42. + new google.maps.Point(12, 40), + new google.maps.Size(25, 40) + ); var styleArray = [ { featureType : "all", diff --git a/djnro/templates/front/index.html b/djnro/templates/front/index.html index 2ae6d47e..be988eef 100644 --- a/djnro/templates/front/index.html +++ b/djnro/templates/front/index.html @@ -8,7 +8,7 @@ {% block bodyclass %}home{% endblock %} {% block content %}
-
+
diff --git a/edumanage/views.py b/edumanage/views.py index 630139e2..9fecfdf5 100644 --- a/edumanage/views.py +++ b/edumanage/views.py @@ -2021,6 +2021,7 @@ def cache_key(inst_key): point['wired_no'] = u"%s" % (sl.wired_no) point['SSID'] = u"%s" % (sl.SSID) point['key'] = u"%s" % sl.pk + point['stage'] = u"%s" % (sl.stage) points[cache_key].append(point) points_ret.extend(points[cache_key])