Merge pull request #3265 from annando/1703-remove-linefeeds

Remove unneeded linefeeds in HTML output
This commit is contained in:
Hypolite Petovan 2017-03-25 16:06:53 -04:00 committed by GitHub
commit 91eeb30bf9
2 changed files with 4 additions and 17 deletions

View file

@ -4,20 +4,17 @@
* @brief The default site template
*/
?>
<!DOCTYPE html >
<?php
<?php
require_once('view/theme/frio/php/frio_boot.php');
// $minimal = is_modal();
?>
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?> ">
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
<?php $baseurl = App::get_baseurl(); ?>
@ -31,8 +28,6 @@
if(x($page,'htmlhead')) echo $page['htmlhead'];
}
?>
</head>
<?php
if(($_SERVER['REQUEST_URI'] != "/register") && ($_SERVER['REQUEST_URI'] != "/lostpass") && ($_SERVER['REQUEST_URI'] != "/login"))
@ -90,7 +85,6 @@ else
";
}
?>
</div><!--row-->
</div><!-- container -->

View file

@ -4,21 +4,17 @@
* @brief The default site template
*/
?>
<!DOCTYPE html >
<html>
<head>
<title><?php if(x($page,'title')) echo $page['title'] ?></title>
<meta name="viewport" content="initial-scale=1.0">
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?> ">
<meta request="<?php echo htmlspecialchars($_REQUEST['pagename']) ?>">
<script>var baseurl="<?php echo App::get_baseurl() ?>";</script>
<script>var frio="<?php echo "view/theme/frio"; ?>";</script>
<?php $baseurl = App::get_baseurl(); ?>
<?php $frio = "view/theme/frio"; ?>
<?php if(x($page,'htmlhead')) echo $page['htmlhead']; ?>
</head>
<body id=\"top\">";
<?php if($_SERVER['REQUEST_URI'] == "/"){header('Location: /login');} ?>
@ -54,7 +50,6 @@
</div>
";
?>
</div><!--row-->
</div><!-- container -->
@ -80,7 +75,7 @@
})
})
}
$('textarea').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
$('input').enterKey(function() {$(this).closest('form').submit(); }, 'ctrl')
</script>
@ -126,7 +121,5 @@ $("nav").bind('nav-update', function(e,data)
</div>
</div>
</div>
</footer>
</body>