diff --git a/WebContent/printing/OSRM.Printing.js b/WebContent/printing/OSRM.Printing.js index e402bc7a2..9def95301 100644 --- a/WebContent/printing/OSRM.Printing.js +++ b/WebContent/printing/OSRM.Printing.js @@ -44,37 +44,58 @@ show: function(response) { var header = '' + - '
' + - '
' + +// '
' + +// '
' + +// '
' + OSRM.loc("GUI_START")+ ':
' + +// '
' + document.getElementById("gui-input-source").value + '
' + +// '
' + OSRM.loc("DISTANCE")+':
' + +// '
' + OSRM.Utils.metersToDistance(response.route_summary.total_distance) + '
' + +// '
' + +// '
' + +// '
' + OSRM.loc("GUI_END")+ ':
' + +// '
' + document.getElementById("gui-input-target").value + '
' + +// '
' + 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("GUI_START")+ ':
' + + '
' + document.getElementById("gui-input-source").value + '
' + '
' + - - '
' + - '
' + OSRM.loc("DISTANCE")+':
' + - '
' + OSRM.loc("DURATION")+':
' + + '
' + + '
' + OSRM.loc("GUI_END")+ ':
' + + '
' + document.getElementById("gui-input-target").value + '
' + '
' + + '
' + + '
' + '
' + - '
' + OSRM.Utils.metersToDistance(response.route_summary.total_distance) + '
' + - '
' + OSRM.Utils.secondsToTime(response.route_summary.total_time) + '
' + + '
' + + '
' + + '
' + OSRM.loc("DISTANCE")+':
' + + '
' + OSRM.Utils.metersToDistance(response.route_summary.total_distance) + '
' + + '
' + + '
' + + '
' + OSRM.loc("DURATION")+':
' + + '
' + OSRM.Utils.secondsToTime(response.route_summary.total_time) + '
' + + '
' + + '
' + '
' + '
' + '
' + - '
' + + '
' + ''; // create route description - var route_desc = ''; + var route_desc = ''; for(var i=0; i < response.route_instructions.length; i++){ //odd or even ? var rowstyle='results-odd'; @@ -83,19 +104,15 @@ show: function(response) { route_desc += ''; route_desc += ''; - route_desc += ''; + route_desc += ''; route_desc += ""; - - route_desc += ''; - route_desc += '
'; // build route description + route_desc += ''; if( response.route_instructions[i][1] != "" ) route_desc += OSRM.loc(OSRM.RoutingDescription.getDrivingInstruction(response.route_instructions[i][0])).replace(/\[(.*)\]/,"$1").replace(/%s/, response.route_instructions[i][1]).replace(/%d/, OSRM.loc(response.route_instructions[i][6])); else route_desc += OSRM.loc(OSRM.RoutingDescription.getDrivingInstruction(response.route_instructions[i][0])).replace(/\[(.*)\]/,"").replace(/%d/, OSRM.loc(response.route_instructions[i][6])); - - route_desc += '
'; route_desc += ""; route_desc += ''; diff --git a/WebContent/printing/printing.css b/WebContent/printing/printing.css index 699f8ae56..570dfdc68 100644 --- a/WebContent/printing/printing.css +++ b/WebContent/printing/printing.css @@ -84,36 +84,32 @@ div.header-title { background-color: #FFF9BB; } -.result-counter -{ - text-align:right; - vertical-align:top; - font-weight:bold; - padding:1px 5px 1px 5px; -} .result-items { text-align:left; vertical-align: middle; width:100%; padding:1px; + border-bottom: 1px solid black; } .result-directions { text-align:left; vertical-align: middle; padding:1px 5px 1px 5px; + border-bottom: 1px solid black; +} +.result-direction +{ + height:36px; + width:36px; } .result-distance { text-align:right; vertical-align: middle; padding:1px 1px 1px 5px; -} -.result-item -{ - cursor:pointer; - color:#000000 + border-bottom: 1px solid black; } .no-results { @@ -238,23 +234,27 @@ div.header-title display:table; width:100%; } +.row +{ + display:table-row; +} .left { display:table-cell; text-align:left; - vertical-align:middle; + vertical-align:top; } .right { display:table-cell; text-align:right; - vertical-align:middle; + vertical-align:top; } .center { display:table-cell; text-align:center; - vertical-align:middle; + vertical-align:top; } .header-group {