Skip to content

Commit 93e87a3

Browse files
mariezmariez
committed
As header.inc and footer.inc has a redirection to header_minified and footer_minified, there is unnecesary code after that redirection that is outdated, so i removed it to avoid confusion.
1 parent e7b862b commit 93e87a3

File tree

2 files changed

+6
-97
lines changed

2 files changed

+6
-97
lines changed

‎footer.inc

+1-39
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,4 @@
33
// use the minified version
44
include dirname(__FILE__).'/footer_minified.inc';
55
return;
6-
?>
7-
8-
9-
<div class="clear"></div>
10-
<div id="newsfeed" class="menutableright block">
11-
<h3><span class="glyphicon glyphicon-bullhorn text-danger"></span> <?php print s('phpList community news');?></h3>
12-
<?php include 'communityfeed.php'; ?>
13-
</div>
14-
</div>
15-
16-
<div id="footer">
17-
<div class="version pull-left">
18-
<a target="_blank" href="https://phplist.com">&copy; phpList ltd.</a> - v<?php echo VERSION?>
19-
</div>
20-
<div class="ressources pull-right">
21-
<a target="_blank" href="./?page=community">Help</a>&nbsp; |
22-
<a target="_blank" href="https://resources.phplist.com">Resources</a>&nbsp; |
23-
<a target="_blank" href="http://twitter.com/phplist">Twitter</a>
24-
</div>
25-
</div>
26-
</div> <!-- end #content -->
27-
</div> <!-- end #container -->
28-
</div> <!-- end .container-fluid-->
29-
30-
<script type="text/javascript" src="ui/phplist-ui-bootlist/js/jquery-1.12.1.min.js"></script>
31-
<script type="text/javascript" src="js/phplistapp.js"></script>
32-
<script type="text/javascript" src="ui/phplist-ui-bootlist/js/bootstrap-select.js"></script>
33-
<script type="text/javascript" src="ui/phplist-ui-bootlist/js/phpList3ToBootstrap.js"></script>
34-
<script type="text/javascript" src="ui/phplist-ui-bootlist/bootstrap/dist/js/bootstrap.min.js"></script>
35-
<script type="text/javascript" src="ui/phplist-ui-bootlist/js/phplist.js"></script>
36-
37-
<script>
38-
/* do not remove this from here */
39-
$(document).ready(function(){
40-
if ( $('body').hasClass('invisible') ){
41-
myfunction();
42-
}
43-
});
44-
</script>
6+
?>

‎header.inc

+5-58
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,6 @@
1-
</head>
2-
<body class="invisible <?php if(isset($GLOBALS['page'])) print $GLOBALS['page'];else print "home-not-auth"; ?>">
3-
<div id="dialog"></div><div id="hiddendiv"></div>
1+
<?php
42

5-
<div class="container-fluid">
6-
7-
<div id="container" class="row">
8-
9-
<nav id="navigation" class="navbar navbar-inverse navbar-fixed-top col-lg-2 col-md-3">
10-
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse_" data-target="#menuTop" aria-expanded="false">
11-
<span class="sr-only">Toggle navigation</span>
12-
<span class="icon-bar"></span>
13-
<span class="icon-bar"></span>
14-
<span class="icon-bar"></span>
15-
</button>
16-
<a href="http://www.phplist.com" target="_blank" class="navbar-brand"><img src="ui/phplist-ui-bootlist/logo.svg" alt="phpList, email newsletter manager, logo" title="phpList, the world's most popular Open Source newsletter manager" /></a>
17-
</nav>
18-
<div id="sidebar" class="sidebar col-lg-2 col-md-3">
19-
<?php echo $firstInstallButton?>
20-
<div id="context-menu" class="menu block">
21-
<?php print _topMenu(); ?>
22-
</div>
23-
<div id="recent" class="menu visited block">
24-
<?php print recentlyVisited(); ?>
25-
</div>
26-
<br />
27-
<div class="col-sm-12 sidebar-footer">
28-
<div id="language">
29-
<?php print $languageswitcher; ?>
30-
</div>
31-
32-
<div id="logged">
33-
<?php
34-
if ($GLOBALS["require_login"] && (!isset ($_SESSION["adminloggedin"]) || !$_SESSION["adminloggedin"])) {
35-
print ('<a id="login" class="navbar-btn btn-primary btn-sm" href="./?page=home">'.s('Login').'</a> ');
36-
} else {
37-
print ('<a id="logout" class="navbar-btn btn-primary btn-sm" href="./?page=logout">'.s('Logout').'</a>');
38-
}
39-
?>
40-
</div>
41-
</div>
42-
</div> <!-- end #sidebar -->
43-
44-
<div class="col-lg-10 col-md-9 col-lg-offset-2 col-md-offset-3" id="content" tabindex=-1>
45-
<div id="globalhelp">
46-
<?php
47-
$globalhelp = $pageinfo->content();
48-
if (!empty($globalhelp)) { ?>
49-
<div class="collapse" id="helptarget">
50-
<div class="alert alert-info">
51-
<?php print $globalhelp ?>
52-
</div>
53-
</div>
54-
<button class="btn btn-xs btn-danger pull-right glyphicon glyphicon-info-sign" type="button" data-toggle="collapse" data-target="#helptarget" aria-expanded="false" aria-controls="collapseExample" title="<?php echo s('HELP') ?>"></button>
55-
<?php } ?>
56-
</div>
57-
<div id="wrapp">
58-
<div id="progressbar"></div>
59-
<!-- content starts here -->
3+
// use the minified version
4+
include dirname(__FILE__).'/header_minified.inc';
5+
return;
6+
?>

0 commit comments

Comments
 (0)