diff --git a/WebContent/printing/OSRM.Printing.js b/WebContent/printing/OSRM.Printing.js index 538507769..196a39a17 100644 --- a/WebContent/printing/OSRM.Printing.js +++ b/WebContent/printing/OSRM.Printing.js @@ -41,26 +41,43 @@ show: function(response) { // add events OSRM.printwindow.document.getElementById('gui-printer').onclick = OSRM.printwindow.printWindow; - // + // localization + OSRM.printwindow.document.getElementById('description-label').innerHTML = OSRM.loc( "ROUTE_DESCRIPTION" ); OSRM.printwindow.document.getElementById('overview-map-label').innerHTML = OSRM.loc( "OVERVIEW_MAP" ); // create header header = '
' + + '
' + + '
' + - '
' + OSRM.loc("ROUTE_DESCRIPTION") + '
' + - '
' + OSRM.loc("DISTANCE")+": " + OSRM.Utils.metersToDistance(response.route_summary.total_distance) + '
' + - '
' + OSRM.loc("DURATION")+": " + OSRM.Utils.secondsToTime(response.route_summary.total_time) + '
' + + '
' + OSRM.loc("GUI_START")+ ':
' + + '
' + OSRM.loc("GUI_END")+ ':
' + '
' + - '
' + + + '
' + + '
' + document.getElementById("gui-input-source").value + '
' + + '
' + document.getElementById("gui-input-target").value + '
' + + '
' + + + '
' + + '
' + OSRM.loc("DISTANCE")+':
' + + '
' + OSRM.loc("DURATION")+':
' + '
' + - '
'; + + '
' + + '
' + OSRM.Utils.metersToDistance(response.route_summary.total_distance) + '
' + + '
' + OSRM.Utils.secondsToTime(response.route_summary.total_time) + '
' + + '
' + + + '
' + + '
' + + '
'; // create route description var route_desc = ''; route_desc += ''; route_desc += ''; - route_desc += ''; route_desc += ''; for(var i=0; i < response.route_instructions.length; i++){ @@ -72,7 +89,6 @@ show: function(response) { route_desc += '"; route_desc += ''; route_desc += '
'+header+'
'; route_desc += ''; - console.log(route_desc); route_desc += "'; @@ -99,8 +115,14 @@ show: function(response) { route_desc += '
'; + + // put everything in DOM OSRM.printwindow.document.getElementById('description').innerHTML = route_desc; + OSRM.printwindow.document.getElementById('overview-description').innerHTML = + '' + + ''+ + '
'+header+'
'; // init map var map = OSRM.printwindow.initialize( OSRM.DEFAULTS.TILE_SERVERS[0] ); diff --git a/WebContent/printing/printing.css b/WebContent/printing/printing.css index 0cbadb27f..8013bec30 100644 --- a/WebContent/printing/printing.css +++ b/WebContent/printing/printing.css @@ -31,6 +31,13 @@ body margin:5px; } +/* route description box */ +#overview-description +{ + width:500px; + margin:5px; +} + /* route map box */ #overview-map @@ -220,4 +227,30 @@ div.header-title font-size: 9px; font-weight: normal; } +} + + +/* table */ +.full +{ + display:table; + width:100%; +} +.left +{ + display:table-cell; + text-align:left; + vertical-align:middle; +} +.right +{ + display:table-cell; + text-align:right; + vertical-align:middle; +} +.center +{ + display:table-cell; + text-align:center; + vertical-align:middle; } \ No newline at end of file diff --git a/WebContent/printing/printing.html b/WebContent/printing/printing.html index 4456fa752..e38518d57 100644 --- a/WebContent/printing/printing.html +++ b/WebContent/printing/printing.html @@ -53,11 +53,13 @@ or see http://www.gnu.org/licenses/agpl.txt. +
Routenbeschreibung
Übersichtskarte
+