diff options
| -rw-r--r-- | core/save-html.c | 9 | ||||
| -rw-r--r-- | theme/list_lib.js | 25 |
2 files changed, 26 insertions, 8 deletions
diff --git a/core/save-html.c b/core/save-html.c index 4c9b428cb..5902a8a71 100644 --- a/core/save-html.c +++ b/core/save-html.c @@ -355,6 +355,10 @@ void write_one_dive(struct membuffer *b, struct dive *dive, const char *photos_d put_HTML_coordinates(b, dive); put_format(b, "\"rating\":%d,", dive->rating); put_format(b, "\"visibility\":%d,", dive->visibility); + put_format(b, "\"current\":%d,", dive->current); + put_format(b, "\"wavesize\":%d,", dive->wavesize); + put_format(b, "\"surge\":%d,", dive->surge); + put_format(b, "\"chill\":%d,", dive->chill); put_format(b, "\"dive_duration\":\"%u:%02u min\",", FRACTION(dive->duration.seconds, 60)); put_string(b, "\"temperature\":{"); @@ -512,8 +516,13 @@ void export_translation(const char *file_name) write_attribute(b, "Advanced_Search", translate("gettextFromC", "Advanced search"), ", "); //Dive expanded view + write_attribute(b, "Rating", translate("gettextFromC", "Rating"), ", "); + write_attribute(b, "WaveSize", translate("gettextFromC", "WaveSize"), ", "); write_attribute(b, "Visibility", translate("gettextFromC", "Visibility"), ", "); + write_attribute(b, "Current", translate("gettextFromC", "Current"), ", "); + write_attribute(b, "Surge", translate("gettextFromC", "Surge"), ", "); + write_attribute(b, "Chill", translate("gettextFromC", "Chill"), ", "); write_attribute(b, "Duration", translate("gettextFromC", "Duration"), ", "); write_attribute(b, "DiveMaster", translate("gettextFromC", "Divemaster"), ", "); write_attribute(b, "Buddy", translate("gettextFromC", "Buddy"), ", "); diff --git a/theme/list_lib.js b/theme/list_lib.js index 143bfd492..05ac98d2a 100644 --- a/theme/list_lib.js +++ b/theme/list_lib.js @@ -224,11 +224,10 @@ function getExpanded(dive) var res = '<table><tr><td class="words">' + translate.Date + ': </td><td>' + dive.date + '</td><td class="words"> ' + translate.Time + ': </td><td>' + dive.time + '</td><td class="words"> ' + translate.Location + ': </td><td>' + '<a onclick=\"Search_list_Modules(\'' + dive.location + '\', {location:true, divemaster:false, buddy:false, notes:false, tags:false,})\">' + dive.location + '</a>' + getDiveCoor(dive) + - '</td></tr></table><table><tr><td class="words">' + translate.Rating + ':</td><td>' + putRating(dive.rating) + - '</td><td class="words"> ' + translate.Visibility + ':</td><td>' + putRating(dive.visibility) + '</td></tr></table>' + '<table><tr><td class="words">' + translate.Air_Temp + ': </td><td>' + dive.temperature.air + '</td><td class="words"> ' + translate.Water_Temp + ': </td><td>' + dive.temperature.water + + '</td><td class="words"> ' + translate.Rating + ':</td><td>' + putRating(dive.rating) + '</td></tr></table><table><tr><td class="words">' + translate.Max_Depth + ': </td><td>' + put_depth_unit(dive.maxdepth) + " " + depth_unit + '</td></tr><tr><td class="words">' + translate.Duration + ': </td><td>' + dive.dive_duration + '</td></tr><tr><td class="words">' + translate.DiveMaster + ': </td><td>' + dive.divemaster + '</td></tr><tr><td class="words"><p>' + translate.Buddy + ': </p></td><td>' + dive.buddy + @@ -964,13 +963,23 @@ function getDiveCoor(dive) */ function get_dive_HTML(dive) { - var res = '<h2 class="det_hed">' + translate.Dive_information + '</h2><table><tr><td class="words">' + translate.Date + ': </td><td>' + dive.date + + var table1 = '<h2 class="det_hed">' + translate.Dive_information + '</h2><table><tr><td class="words">' + translate.Date + ': </td><td>' + dive.date + '</td><td class="words"> ' + translate.Time + ': </td><td>' + dive.time + '</td><td class="words"> ' + translate.Location + ': </td><td>' + '<a onclick=\"Search_list_Modules(\'' + dive.location + '\', {location:true, divemaster:false, buddy:false, notes:false, tags:false,})\">' + dive.location + '</a></td>' + getDiveCoor(dive) + - '</tr></table><table><tr><td class="words">' + translate.Rating + ':</td><td>' + putRating(dive.rating) + - '</td><td class="words"> ' + translate.Visibility + ':</td><td>' + putRating(dive.visibility) + - '</td></tr></table>' + - '<table><tr><td class="words">' + translate.Air_Temp + ': </td><td>' + dive.temperature.air + + '</tr></table>'; + var table2 = '<table><tr><td class="words">' + translate.Rating + ':</td><td>' + putRating(dive.rating) + '</td>'; + if (dive.wavesize > 0) + table2 += '<td class="words"> ' + translate.WaveSize + ':</td><td>' + putRating(dive.wavesize) + '</td>'; + if (dive.visibility > 0) + table2 += '</td><td class="words"> ' + translate.Visibility + ':</td><td>' + putRating(dive.visibility) + '</td>'; + if (dive.current > 0) + table2 += '<td class="words"> ' + translate.Current + ':</td><td>' + putRating(dive.current) + '</td>'; + if (dive.surge > 0) + table2 += '<td class="words"> ' + translate.Surge + ':</td><td>' + putRating(dive.surge) + '</td>'; + if (dive.chill > 0) + table2 += '<td class="words"> ' + translate.Chill + ':</td><td>' + putRating(dive.chill) + '</td>'; + table2 += '</tr></table>'; + var table3 = '<table><tr><td class="words">' + translate.Air_Temp + ': </td><td>' + dive.temperature.air + '</td><td class="words"> ' + translate.Water_Temp + ': </td><td>' + dive.temperature.water + '</td></tr></table><table><tr><td class="words">' + translate.Max_Depth + ': </td><td>' + put_depth_unit(dive.maxdepth) + " " + depth_unit + '</td></tr><tr><td class="words">' + translate.Duration + ': </td><td>' + dive.dive_duration + '</td></tr><tr><td class="words">' + translate.DiveMaster + ': </td><td>' + dive.divemaster + @@ -978,7 +987,7 @@ function get_dive_HTML(dive) '</td></tr><tr><td class="words">' + translate.Suit + ': </td><td>' + dive.suit + '</td></tr><tr><td class="words">' + translate.Tags + ': </td><td>' + putTags(dive.tags) + '</td></tr></table>'+ put_divecomputer_details(dive.divecomputers) +'<div style="margin:10px;"><p class="words">' + translate.Notes + ': </p>' + dive.notes + '</div>'; - return res; + return table1 + table2 + table3; }; function put_divecomputer_details(dc) |