Show
Ignore:
Timestamp:
07.05.2013 14:35:49 (6 years ago)
Author:
kjdon
Message:

when we have just started a new year, output the month even if it is the same as the last month output, otherwise it seems as though the first item in the list has no month

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/datelistbrowserclass.cpp

    r27108 r27309  
    149149 
    150150    textout << outconvert << "<tr valign=top>"; 
    151  
     151    bool new_year = false; 
    152152    if (thisyear != "" && thisyear != lastyear) { 
    153153      textout << outconvert << "<td><span class=\"date_list_year\">" << thisyear << "</span></td>"; 
    154154      lastyear = thisyear; 
     155      new_year = true; 
    155156    } else { 
    156157      textout << outconvert << "<td></td>"; 
    157158    } 
    158     if (thismonth != "" && thismonth != lastmonth) { 
     159    if (thismonth != "" && (thismonth != lastmonth || new_year)) { 
    159160      textout << outconvert << disp << ("<td><span class=\"date_list_month\">_textmonth" + thismonth + "_</span></td>"); 
    160161      lastmonth = thismonth;