use new 'view/requestUrl' to avoid '/@@index.html' in URLs

This commit is contained in:
Helmut Merz 2016-06-09 10:32:04 +02:00
parent 8777d1ecdb
commit 043d423a0e
7 changed files with 7 additions and 7 deletions

View file

@ -9,7 +9,7 @@
<div class="top span-6" <div class="top span-6"
metal:define-slot="top"> metal:define-slot="top">
<a href="#" name="top" metal:define-slot="logo" <a href="#" name="top" metal:define-slot="logo"
tal:attributes="href string:${request/URL/1}"><img class="logo" tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
src="logo.gif" border="0" alt="Home" src="logo.gif" border="0" alt="Home"
tal:attributes="src string:${resourceBase}logo.gif" /></a> tal:attributes="src string:${resourceBase}logo.gif" /></a>
<div metal:define-slot="top-actions"> <div metal:define-slot="top-actions">

View file

@ -7,7 +7,7 @@
<div id="global" metal:define-macro="global"> <div id="global" metal:define-macro="global">
<div class="top" metal:define-slot="top"> <div class="top" metal:define-slot="top">
<a href="#" name="top" metal:define-slot="logo" <a href="#" name="top" metal:define-slot="logo"
tal:attributes="href string:${request/URL/1}"><img class="logo" tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
src="logo.gif" border="0" alt="Home" src="logo.gif" border="0" alt="Home"
tal:attributes="src string:${resourceBase}logo.gif" /></a> tal:attributes="src string:${resourceBase}logo.gif" /></a>
<div metal:define-slot="top-actions"> <div metal:define-slot="top-actions">

View file

@ -35,7 +35,7 @@
<div id="global"> <div id="global">
<div class="top" metal:define-slot="top"> <div class="top" metal:define-slot="top">
<a href="#" name="top" metal:define-slot="logo" <a href="#" name="top" metal:define-slot="logo"
tal:attributes="href string:${request/URL/1}"><img class="logo" tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
src="logo.gif" border="0" alt="Home" src="logo.gif" border="0" alt="Home"
tal:attributes="src string:${resourceBase}logo.gif" /></a> tal:attributes="src string:${resourceBase}logo.gif" /></a>
</div> </div>

View file

@ -24,7 +24,7 @@
You are not authorized to perform this action. However, you may login as a You are not authorized to perform this action. However, you may login as a
different user who is authorized.</p> different user who is authorized.</p>
<form action="." method="post" <form action="." method="post"
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<div tal:omit-tag="" <div tal:omit-tag=""
tal:condition="python:principal != 'zope.anybody' and 'SUBMIT' in request"> tal:condition="python:principal != 'zope.anybody' and 'SUBMIT' in request">
<span tal:define="dummy python: <span tal:define="dummy python:

View file

@ -12,7 +12,7 @@
region="top" splitter="false"> region="top" splitter="false">
<div class="top" metal:define-slot="top"> <div class="top" metal:define-slot="top">
<a href="#" name="top" metal:define-slot="logo" <a href="#" name="top" metal:define-slot="logo"
tal:attributes="href string:${request/URL/1}"><img class="logo" tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
src="logo.gif" border="0" alt="Home" src="logo.gif" border="0" alt="Home"
tal:attributes="src string:${resourceBase}logo.gif" /></a> tal:attributes="src string:${resourceBase}logo.gif" /></a>
</div> </div>

View file

@ -20,7 +20,7 @@
</tal:js> </tal:js>
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" <link rel="shortcut icon" type="image/x-icon" href="favicon.ico"
tal:attributes="href string:${view/page/resourceBase}${layout/favicon}" /> tal:attributes="href string:${view/page/resourceBase}${layout/favicon}" />
<base href="." tal:attributes="href request/URL"> <base href="." tal:attributes="href view/requestUrl">
</head> </head>
<body tal:replace="structure body" /> <body tal:replace="structure body" />
</html> </html>

View file

@ -7,7 +7,7 @@
<div id="global" metal:define-macro="global"> <div id="global" metal:define-macro="global">
<div class="top" metal:define-slot="top"> <div class="top" metal:define-slot="top">
<a href="#" name="top" metal:define-slot="logo" <a href="#" name="top" metal:define-slot="logo"
tal:attributes="href string:${request/URL/1}"><img class="logo" tal:attributes="href string:${view/requestUrl/1}"><img class="logo"
border="0" alt="Home" border="0" alt="Home"
tal:attributes="src string:${resourceBase}logo.png" /></a> tal:attributes="src string:${resourceBase}logo.png" /></a>
<div metal:define-slot="top-actions"> <div metal:define-slot="top-actions">