Keep meta and links together

pull/6612/head
Aleksander Machniak 6 years ago
parent 9d51e40f9e
commit 9a757aa688

@ -1,5 +1,6 @@
<link rel="index" href="$__comm_path" /> <link rel="index" href="$__comm_path" />
<roundcube:object name="meta" /> <roundcube:object name="meta" />
<roundcube:object name="links" />
<link rel="stylesheet" type="text/css" href="/common.css" /> <link rel="stylesheet" type="text/css" href="/common.css" />
<roundcube:if condition="in_array(env:task, array('mail', 'addressbook', 'settings'))" /> <roundcube:if condition="in_array(env:task, array('mail', 'addressbook', 'settings'))" />
<link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" /> <link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" />
@ -7,4 +8,3 @@
<roundcube:if condition="browser:safari" /> <roundcube:if condition="browser:safari" />
<link rel="stylesheet" type="text/css" href="/safari.css" /> <link rel="stylesheet" type="text/css" href="/safari.css" />
<roundcube:endif /> <roundcube:endif />
<roundcube:object name="links" />

@ -16,6 +16,7 @@
<head> <head>
<title><roundcube:object name="pagetitle" /></title> <title><roundcube:object name="pagetitle" /></title>
<roundcube:object name="meta" /> <roundcube:object name="meta" />
<roundcube:object name="links" />
<link rel="stylesheet" href="/deps/bootstrap.min.css"> <link rel="stylesheet" href="/deps/bootstrap.min.css">
<roundcube:if condition="config:devel_mode" /> <roundcube:if condition="config:devel_mode" />
<link rel="stylesheet/less" href="/styles/styles.less"> <link rel="stylesheet/less" href="/styles/styles.less">
@ -25,7 +26,6 @@
<link rel="stylesheet" href="/styles/styles.css"> <link rel="stylesheet" href="/styles/styles.css">
<roundcube:link rel="stylesheet" href="/styles/print.css" condition="env:action == 'print'" /> <roundcube:link rel="stylesheet" href="/styles/print.css" condition="env:action == 'print'" />
<roundcube:endif /> <roundcube:endif />
<roundcube:object name="links" />
</head> </head>
<body class="task-<roundcube:exp expression="env:error_task ?: env:task ?: 'error'">"> <body class="task-<roundcube:exp expression="env:error_task ?: env:task ?: 'error'">">
<roundcube:if condition="!env:framed || env:extwin" /> <roundcube:if condition="!env:framed || env:extwin" />

@ -1,10 +1,10 @@
<meta name="viewport" content="" id="viewport" /> <meta name="viewport" content="" id="viewport" />
<roundcube:object name="meta" /> <roundcube:object name="meta" />
<roundcube:object name="links" />
<link rel="stylesheet" type="text/css" href="/styles.css" /> <link rel="stylesheet" type="text/css" href="/styles.css" />
<roundcube:if condition="in_array(env:task, array('mail','addressbook','settings'))" /> <roundcube:if condition="in_array(env:task, array('mail','addressbook','settings'))" />
<link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" /> <link rel="stylesheet" type="text/css" href="/<roundcube:var name="env:task" />.css" />
<roundcube:endif /> <roundcube:endif />
<roundcube:object name="links" />
<script type="text/javascript" src="/ui.js"></script> <script type="text/javascript" src="/ui.js"></script>
<roundcube:add_label name="errortitle" /> <roundcube:add_label name="errortitle" />
<roundcube:add_label name="toggleadvancedoptions" /> <roundcube:add_label name="toggleadvancedoptions" />

Loading…
Cancel
Save