Skip to content

Commit

Permalink
minor html fixes removing type from javascript or css files, adding m…
Browse files Browse the repository at this point in the history
…eta info and viewport information
  • Loading branch information
dominictayloruk committed Aug 19, 2019
1 parent 606efa9 commit e3effd8
Showing 1 changed file with 10 additions and 7 deletions.
17 changes: 10 additions & 7 deletions html/html/themes/ipfire/include/functions.pl
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
# @param submenu entries
sub showsubmenu() {
my $submenus = shift;

print "<ul>";
foreach my $item (sort keys %$submenus) {
$link = getlink($submenus->{$item});
Expand Down Expand Up @@ -126,23 +126,26 @@ sub openpage {
<title>$headline - $title</title>
$extrahead
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta name="theme-color" content="#E12917"/>
<meta name="Description" content="$settings{'HOSTNAME'}.$settings{'DOMAINNAME'}">
<link rel="shortcut icon" href="/favicon.ico" />
<script type="text/javascript" src="/include/jquery.js"></script>
<script src="/include/jquery.js"></script>
<script type="text/javascript">
<script>
function swapVisibility(id) {
\$('#' + id).toggle();
}
</script>
END

foreach my $stylesheet (@stylesheets) {
print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" type=\"text/css\" />\n";
print "<link href=\"/themes/ipfire/include/css/$stylesheet\" rel=\"stylesheet\" />\n";
}

if ($settings{'SPEED'} ne 'off') {
print <<END
<script type="text/javascript" src="/themes/ipfire/include/js/refreshInetInfo.js"></script>
<script src="/themes/ipfire/include/js/refreshInetInfo.js"></script>
END
;
}
Expand All @@ -152,8 +155,8 @@ END
<body>
<div id="header" class="fixed">
<div id="logo">
<a href="https://www.ipfire.org" style="text-decoration: none;">
<img src="/themes/ipfire/images/tux2.png" style="float:left; margin-left: -3px; margin-top: -3px;"/>
<a href="https://www.ipfire.org" aria-label="ipfire logo" style="text-decoration: none;">
<img src="/themes/ipfire/images/tux2.png" alt="ipfire logo" style="float:left; margin-left: -3px; margin-top: -3px;"/>
END
;
if ($settings{'WINDOWWITHHOSTNAME'} ne 'off') {
Expand Down

0 comments on commit e3effd8

Please sign in to comment.