Skip to content

Commit 9509724

Browse files
committed
issue doxygen#11448 Handling of TIMESTAMP in html footer and header
1 parent 2e44578 commit 9509724

File tree

1 file changed

+32
-23
lines changed

1 file changed

+32
-23
lines changed

src/htmlgen.cpp

Lines changed: 32 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -397,18 +397,13 @@ static QCString substituteHtmlKeywords(const QCString &file,
397397

398398
switch (Config_getEnum(TIMESTAMP))
399399
{
400-
case TIMESTAMP_t::YES:
401-
case TIMESTAMP_t::DATETIME:
402-
generatedBy = theTranslator->trGeneratedAt(dateToString(DateTimeType::DateTime),
403-
convertToHtml(Config_getString(PROJECT_NAME)));
404-
break;
405-
case TIMESTAMP_t::DATE:
406-
generatedBy = theTranslator->trGeneratedAt(dateToString(DateTimeType::Date),
407-
convertToHtml(Config_getString(PROJECT_NAME)));
408-
break;
409400
case TIMESTAMP_t::NO:
410401
generatedBy = theTranslator->trGeneratedBy();
411402
break;
403+
default:
404+
generatedBy = theTranslator->trGeneratedAt("<span class=\"timestamp\"></span>",
405+
convertToHtml(Config_getString(PROJECT_NAME)));
406+
break;
412407
}
413408
if (treeView)
414409
{
@@ -1396,6 +1391,29 @@ static void writeDefaultStyleSheet(TextStream &t)
13961391
}
13971392
t << replaceVariables(cssStr);
13981393

1394+
bool addTimestamp = Config_getEnum(TIMESTAMP)!=TIMESTAMP_t::NO;
1395+
if (addTimestamp)
1396+
{
1397+
QCString timeStampStr;
1398+
switch (Config_getEnum(TIMESTAMP))
1399+
{
1400+
case TIMESTAMP_t::YES:
1401+
case TIMESTAMP_t::DATETIME:
1402+
timeStampStr = dateToString(DateTimeType::DateTime);
1403+
break;
1404+
case TIMESTAMP_t::DATE:
1405+
timeStampStr = dateToString(DateTimeType::Date);
1406+
break;
1407+
default:
1408+
break;
1409+
}
1410+
t << "\nhtml {\n";
1411+
t << "--timestamp: '" << timeStampStr << "'\n";
1412+
t << "}\n";
1413+
t << "span.timestamp { content: ' '; }\n";
1414+
t << "span.timestamp:before { content: var(--timestamp); }\n\n";
1415+
}
1416+
13991417
// For Webkit based the scrollbar styling cannot be overruled (bug in chromium?).
14001418
// To allow the user to style the scrollbars differently we should only add it in case
14011419
// the user did not specify any extra stylesheets.
@@ -1507,21 +1525,12 @@ QCString HtmlGenerator::writeLogoAsString(const QCString &path)
15071525
QCString result;
15081526
switch (Config_getEnum(TIMESTAMP))
15091527
{
1510-
case TIMESTAMP_t::YES:
1511-
case TIMESTAMP_t::DATETIME:
1512-
result += theTranslator->trGeneratedAt(
1513-
dateToString(DateTimeType::DateTime),
1514-
Config_getString(PROJECT_NAME)
1515-
);
1516-
break;
1517-
case TIMESTAMP_t::DATE:
1518-
result += theTranslator->trGeneratedAt(
1519-
dateToString(DateTimeType::Date),
1520-
Config_getString(PROJECT_NAME)
1521-
);
1522-
break;
15231528
case TIMESTAMP_t::NO:
1524-
result += theTranslator->trGeneratedBy();
1529+
result = theTranslator->trGeneratedBy();
1530+
break;
1531+
default:
1532+
result = theTranslator->trGeneratedAt("<span class=\"timestamp\"></span>",
1533+
convertToHtml(Config_getString(PROJECT_NAME)));
15251534
break;
15261535
}
15271536
result += "&#160;\n<a href=\"https://www.doxygen.org/index.html\">\n"

0 commit comments

Comments
 (0)