From 35bb9efa51361ed5ebb55b69524233c47487e073 Mon Sep 17 00:00:00 2001 From: DennisSchiefer Date: Wed, 4 Jul 2012 15:35:06 +0100 Subject: [PATCH] separated normal notifications from important notifications (that lock the screen) --- WebContent/gui/OSRM.Timers.js | 57 +++++++++++++++++--------- WebContent/images/down.png | Bin 0 -> 2902 bytes WebContent/images/down_active.png | Bin 0 -> 2919 bytes WebContent/images/down_hover.png | Bin 0 -> 2909 bytes WebContent/images/up.png | Bin 0 -> 2911 bytes WebContent/images/up_active.png | Bin 0 -> 2933 bytes WebContent/images/up_hover.png | Bin 0 -> 2924 bytes WebContent/main.css | 20 +++++++-- WebContent/main.html | 20 +++++++-- WebContent/main.js | 65 +++++++++++++++++++++++++----- 10 files changed, 128 insertions(+), 34 deletions(-) create mode 100644 WebContent/images/down.png create mode 100644 WebContent/images/down_active.png create mode 100644 WebContent/images/down_hover.png create mode 100644 WebContent/images/up.png create mode 100644 WebContent/images/up_active.png create mode 100644 WebContent/images/up_hover.png diff --git a/WebContent/gui/OSRM.Timers.js b/WebContent/gui/OSRM.Timers.js index 19224d06f..ab65537af 100644 --- a/WebContent/gui/OSRM.Timers.js +++ b/WebContent/gui/OSRM.Timers.js @@ -23,44 +23,65 @@ OSRM.GUI.extend( { // notifications notifications: [ - { time: 30000, - header: "[Tooltip] Clicking and Dragging", - body: "You can simply click on the map to set source and target markers. " + - "Then you can continue and drag the markers over the map or create. " + - "

" + - "You can even create additional markers by dragging them off of the main route." + - "Markers can be simply deleted by clicking on them.", - _class: "Routing", - _func: "getRoute_Dragging" - } + { time: 7000, + header: "[Tooltip] Clicking and Dragging", + body: "You can simply click on the map to set source and target markers. " + + "Then you can continue and drag the markers over the map or create. " + + "

" + + "You can even create additional markers by dragging them off of the main route." + + "Markers can be simply deleted by clicking on them.", + _classes: ["Routing"], + _funcs: ["getRoute_Dragging"] + }, + { time: 4000, + header: "[Tooltip] Clicking and Dragging 2", + body: "You can simply click on the map to set source and target markers. " + + "Then you can continue and drag the markers over the map or create. " + + "

" + + "You can even create additional markers by dragging them off of the main route." + + "Markers can be simply deleted by clicking on them.", + _classes: ["Routing"], + _funcs: ["getRoute_Dragging"] + } ], // initialize notification timers init: function() { - // init variables + // init timers var notifications = OSRM.GUI.notifications; OSRM.G.notification_timers = new Array( notifications.length ); - - // init timers for( var i=0, iEnd=notifications.length; iG`3`0&5B@7@rCkc{81!l-F!jKd& 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 AG5`Po literal 0 HcmV?d00001 diff --git a/WebContent/images/down_active.png b/WebContent/images/down_active.png new file mode 100644 index 0000000000000000000000000000000000000000..546d6cfb2c2e2e76d4327ade2145e3e0fe37ec84 GIT binary patch literal 2919 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 Hu0mjfLH?3z literal 0 HcmV?d00001 diff --git a/WebContent/images/up.png b/WebContent/images/up.png new file mode 100644 index 0000000000000000000000000000000000000000..0a2f090dc37c778455a2091f1de51bba6d3bd529 GIT binary patch literal 2911 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 JPDHLkV1ijLkEZ|t literal 0 HcmV?d00001 diff --git a/WebContent/images/up_active.png b/WebContent/images/up_active.png new file mode 100644 index 0000000000000000000000000000000000000000..8d8d4d38449365b62cb0d4538622b90b592f6ce4 GIT binary patch literal 2933 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
- -
+ +
+
+
+ +
+
Notification
+ + +
+
+
+
+ +
+
+
Notification
-
diff --git a/WebContent/main.js b/WebContent/main.js index 7267f8ac3..2e5e14dce 100644 --- a/WebContent/main.js +++ b/WebContent/main.js @@ -63,6 +63,12 @@ OSRM.prefetchImages = function() { {id:'restore', url:'images/restore.png'}, {id:'restore_active', url:'images/restore_active.png'}, {id:'restore_hover', url:'images/restore_hover.png'}, + {id:'up', url:'images/up.png'}, + {id:'up_active', url:'images/up_active.png'}, + {id:'up_hover', url:'images/up_hover.png'}, + {id:'down', url:'images/down.png'}, + {id:'down_active', url:'images/down_active.png'}, + {id:'down_hover', url:'images/down_hover.png'}, {id:'config', url:'images/config.png'}, {id:'config_active', url:'images/config_active.png'}, {id:'config_hover', url:'images/config_hover.png'}, @@ -136,6 +142,14 @@ OSRM.prefetchCSSIcons = function() { { id:'.cancel-marker:hover', image_id:'cancel_hover'}, { id:'.cancel-marker:active', image_id:'cancel_active'}, + { id:'.up-marker', image_id:'up'}, + { id:'.up-marker:hover', image_id:'up_hover'}, + { id:'.up-marker:active', image_id:'up_active'}, + + { id:'.down-marker', image_id:'down'}, + { id:'.down-marker:hover', image_id:'down_hover'}, + { id:'.down-marker:active', image_id:'down_active'}, + { id:'#input-mask-header', image_id:'osrm-logo'}, { id:'.styled-select', image_id:'selector'}, @@ -270,25 +284,56 @@ OSRM.parseParameters = function(){ // check whether to activate maintenance mode OSRM.inMaintenance = function(){ if( OSRM.DEFAULTS.MAINTENANCE == true ) { - OSRM.notify( OSRM.DEFAULTS.MAINTENANCE_HEADER, OSRM.DEFAULTS.MAINTENANCE_TEXT, false); + OSRM.xnotify( OSRM.DEFAULTS.MAINTENANCE_HEADER, OSRM.DEFAULTS.MAINTENANCE_TEXT, false); return true; } return false; }; -//general notification box -OSRM.notify = function( header, text, closable ){ - document.getElementById('notification-blanket').style.display = "block"; +// important notifications +OSRM.xnotify = function( header, text, closable ){ + document.getElementById('important-notification-blanket').style.display = "block"; + document.getElementById('important-notification-label').innerHTML = header; + document.getElementById('important-notification-box').innerHTML = text; + if( closable ) + document.getElementById('important-notification-toggle').onclick = OSRM.xdenotify; + else + document.getElementById('important-notification-toggle').style.display = "none"; +}; +OSRM.xdenotify = function() { + document.getElementById('important-notification-blanket').style.display = "none"; +}; + +// normal notification box +OSRM.notify = function( header, text ){ + document.getElementById('notification-wrapper').style.display = "block"; document.getElementById('notification-label').innerHTML = header; document.getElementById('notification-box').innerHTML = text; - if( closable ) - document.getElementById('notification-toggle').onclick = OSRM.denotify; - else - document.getElementById('notification-toggle').style.display = "none"; -}, + document.getElementById('notification-box').style.display = "block"; // trick to always obtain a closed notification box + OSRM.resize(); + + document.getElementById('notification-toggle').onclick = OSRM.denotify; + document.getElementById('notification-resize').onclick = OSRM.resize; +}; +OSRM.resize = function() { + if( document.getElementById('notification-box').style.display == "none" ) { + document.getElementById('notification-content').style.height = "200px"; + document.getElementById('notification-wrapper').style.height = "220px"; + document.getElementById('notification-box').style.display = "block"; + document.getElementById('notification-resize').className = "iconic-button up-marker top-right-button"; + } else { + document.getElementById('notification-content').style.height = "18px"; + document.getElementById('notification-wrapper').style.height = "38px"; + document.getElementById('notification-box').style.display = "none"; + document.getElementById('notification-resize').className = "iconic-button down-marker top-right-button"; + } +}; OSRM.denotify = function() { - document.getElementById('notification-blanket').style.display = "none"; + document.getElementById('notification-wrapper').style.display = "none"; +}; +OSRM.isNotifyVisible = function() { + return document.getElementById('notification-wrapper').style.display == "block"; };