cco/loops
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Helmut Merz 2016-06-09 10:22:30 +02:00
parent a8f70fd498
commit 9e9390cff3
14 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser/add.pt
View file

@ -5,7 +5,7 @@
<div metal:define-macro="addform"> <div metal:define-macro="addform">
<form action="." tal:attributes="action request/URL" <form action="." tal:attributes="action view/requestUrl"
method="post" enctype="multipart/form-data"> method="post" enctype="multipart/form-data">
<div metal:define-macro="formbody"> <div metal:define-macro="formbody">

2
browser/contents.pt
View file

@ -15,7 +15,7 @@
<tal:checkmove define="dummy view/checkMoveAction"> <tal:checkmove define="dummy view/checkMoveAction">
<form name="contents" method="post" action="." <form name="contents" method="post" action="."
tal:attributes="action request/URL" tal:attributes="action view/requestUrl"
tal:define="container_contents view/listContentInfo"> tal:define="container_contents view/listContentInfo">
<metal:keep-batch define-macro="keep_batch_params"> <metal:keep-batch define-macro="keep_batch_params">
<tal:param repeat="param python:('b_page', 'b_size', 'b_overlap', 'b_orphan')"> <tal:param repeat="param python:('b_page', 'b_size', 'b_overlap', 'b_orphan')">

2
browser/dataform.pt
View file

@ -26,7 +26,7 @@
<div metal:define-macro="content"> <div metal:define-macro="content">
<form action="." metal:define-macro="master" <form action="." metal:define-macro="master"
tal:attributes="action request/URL" method="post" tal:attributes="action view/requestUrl" method="post"
class="edit-form" enctype="multipart/form-data" class="edit-form" enctype="multipart/form-data"
id="zc.page.browser_form"> id="zc.page.browser_form">

2
browser/edit.pt
View file

@ -17,7 +17,7 @@
<div metal:fill-slot="body"> <div metal:fill-slot="body">
<div metal:define-macro="body"> <div metal:define-macro="body">
<form action="." tal:attributes="action request/URL" method="post" <form action="." tal:attributes="action view/requestUrl" method="post"
enctype="multipart/form-data"> enctype="multipart/form-data">
<input type="hidden" name="form_submitted" value="true" /> <input type="hidden" name="form_submitted" value="true" />

4
browser/exportimport.pt
View file

@ -19,7 +19,7 @@
</div> </div>
<form action="." method="post" <form action="." method="post"
tal:attributes="action string:${request/URL/-1}/export_nodes.html"> tal:attributes="action string:${view/requestUrl/-1}/export_nodes.html">
<input type="hidden" name="loops.action" value="export" /> <input type="hidden" name="loops.action" value="export" />
<div>&nbsp;</div> <div>&nbsp;</div>
<h4>Export Nodes</h4> <h4>Export Nodes</h4>
@ -32,7 +32,7 @@
</form> </form>
<form action="." method="post" enctype="multipart/form-data" <form action="." method="post" enctype="multipart/form-data"
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<input type="hidden" name="loops.action" value="upload" /> <input type="hidden" name="loops.action" value="upload" />
<div>&nbsp;</div> <div>&nbsp;</div>
<h4>Import Nodes</h4> <h4>Import Nodes</h4>

2
browser/pageform.pt
View file

@ -9,7 +9,7 @@
<div metal:define-macro="form"> <div metal:define-macro="form">
<form action="." metal:define-macro="master" <form action="." metal:define-macro="master"
tal:attributes="action request/URL" method="post" tal:attributes="action view/requestUrl" method="post"
class="edit-form" enctype="multipart/form-data" class="edit-form" enctype="multipart/form-data"
id="zc.page.browser_form"> id="zc.page.browser_form">

6
browser/relation_macros.pt
View file

@ -18,7 +18,7 @@
<form metal:define-macro="listing_form" <form metal:define-macro="listing_form"
method="post" action="." method="post" action="."
tal:define="formName formName|string:listing" tal:define="formName formName|string:listing"
tal:attributes="action request/URL; tal:attributes="action view/requestUrl;
name formName" name formName"
tal:condition="items"> tal:condition="items">
<input type="hidden" name="action" value="remove" <input type="hidden" name="action" value="remove"
@ -117,7 +117,7 @@
i18n:translate="" i18n:translate=""
style="padding: 0 4px 0 4px">Create Object</legend> style="padding: 0 4px 0 4px">Create Object</legend>
<form method="post" name="listing" action="." <form method="post" name="listing" action="."
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<input type="hidden" name="action" value="create" /> <input type="hidden" name="action" value="create" />
<div class="row"> <div class="row">
<span i18n:translate="">Name</span> <span i18n:translate="">Name</span>
@ -169,7 +169,7 @@
<metal:search define-macro="search"> <metal:search define-macro="search">
<form method="post" name="listing" action="." <form method="post" name="listing" action="."
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<input type="hidden" name="action" value="search" /> <input type="hidden" name="action" value="search" />
<div class="row" <div class="row"
tal:define="searchTerm request/searchTerm | nothing; tal:define="searchTerm request/searchTerm | nothing;

4
browser/resource_macros.pt
View file

@ -10,7 +10,7 @@
<div metal:use-macro="views/node_macros/object_actions" /> <div metal:use-macro="views/node_macros/object_actions" />
</tal:actions> </tal:actions>
<h1><a tal:omit-tag="python: level > 1" <h1><a tal:omit-tag="python: level > 1"
tal:attributes="href request/URL" tal:attributes="href view/requestUrl"
tal:content="item/title">Title</a></h1> tal:content="item/title">Title</a></h1>
<tal:desc define="description description|item/renderedDescription" <tal:desc define="description description|item/renderedDescription"
condition="description"> condition="description">
@ -51,7 +51,7 @@
<div tal:attributes="ondblclick python: item.openEditWindow('edit.html')"> <div tal:attributes="ondblclick python: item.openEditWindow('edit.html')">
<div metal:use-macro="views/node_macros/object_actions" /> <div metal:use-macro="views/node_macros/object_actions" />
<h1><a tal:omit-tag="python: level > 1" <h1><a tal:omit-tag="python: level > 1"
tal:attributes="href request/URL" tal:attributes="href view/requestUrl"
tal:content="item/title">Title</a></h1><br /> tal:content="item/title">Title</a></h1><br />
<img tal:attributes="src <img tal:attributes="src
string:${view/url}/.${view/targetId}/view?version=this" /> string:${view/url}/.${view/targetId}/view?version=this" />

6
browser/target_macros.pt
View file

@ -10,7 +10,7 @@
method="post" name="listing" action="." method="post" name="listing" action="."
tal:define="target nocall:view/target" tal:define="target nocall:view/target"
tal:condition="python: target or items" tal:condition="python: target or items"
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<input type="hidden" name="action" value="assign" <input type="hidden" name="action" value="assign"
tal:attributes="value action" /> tal:attributes="value action" />
<table class="listing" summary="Currently assigned" <table class="listing" summary="Currently assigned"
@ -83,7 +83,7 @@
<fieldset> <fieldset>
<legend i18n:translate="">Create Target</legend> <legend i18n:translate="">Create Target</legend>
<form method="post" name="listing" action="." <form method="post" name="listing" action="."
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<input type="hidden" name="action" value="create" /> <input type="hidden" name="action" value="create" />
<div class="row"> <div class="row">
<span i18n:translate="">Name</span> <span i18n:translate="">Name</span>
@ -114,7 +114,7 @@
<metal:search define-macro="search"> <metal:search define-macro="search">
<form method="post" name="listing" action="." <form method="post" name="listing" action="."
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<input type="hidden" name="action" value="search" /> <input type="hidden" name="action" value="search" />
<div class="row" <div class="row"
tal:define="searchTerm request/searchTerm | nothing; tal:define="searchTerm request/searchTerm | nothing;

4
external/exportimport.pt vendored
View file

@ -19,7 +19,7 @@
</div> </div>
<form action="." method="post" <form action="." method="post"
tal:attributes="action string:${request/URL/-1}/export_loops.html"> tal:attributes="action string:${view/requestUrl/-1}/export_loops.html">
<input type="hidden" name="loops.action" value="export" /> <input type="hidden" name="loops.action" value="export" />
<div>&nbsp;</div> <div>&nbsp;</div>
<h4>Export Site</h4> <h4>Export Site</h4>
@ -93,7 +93,7 @@
</form> </form>
<form action="." method="post" enctype="multipart/form-data" <form action="." method="post" enctype="multipart/form-data"
tal:attributes="action request/URL"> tal:attributes="action view/requestUrl">
<input type="hidden" name="loops.action" value="upload" /> <input type="hidden" name="loops.action" value="upload" />
<div>&nbsp;</div> <div>&nbsp;</div>
<h4>Import Site</h4> <h4>Import Site</h4>

4
knowledge/glossary/view_macros.pt
View file

@ -9,7 +9,7 @@
class="navlink"> class="navlink">
<a href="#" <a href="#"
tal:omit-tag="python: letter not in data.keys()" tal:omit-tag="python: letter not in data.keys()"
tal:attributes="href string:${request/URL/-1}#$letter" tal:attributes="href string:${view/requestUrl/-1}#$letter"
tal:content="letter">A</a> tal:content="letter">A</a>
</span> </span>
</div> </div>
@ -17,7 +17,7 @@
<div tal:repeat="letter data/keys"> <div tal:repeat="letter data/keys">
<div class="subtitle"><a name="A" href="#top" <div class="subtitle"><a name="A" href="#top"
tal:attributes="name letter; tal:attributes="name letter;
href string:${request/URL/-1}#top" href string:${view/requestUrl/-1}#top"
tal:content="letter">A</a> tal:content="letter">A</a>
</div> </div>
<div tal:repeat="related data/?letter|python:[]"> <div tal:repeat="related data/?letter|python:[]">

6
knowledge/survey/view_macros.pt
View file

@ -40,7 +40,7 @@
tal:condition="reports"> tal:condition="reports">
<b i18n:translate="label_survey_show_report">Show Report</b>: &nbsp; <b i18n:translate="label_survey_show_report">Show Report</b>: &nbsp;
<a tal:repeat="report reports" <a tal:repeat="report reports"
tal:attributes="href string:${request/URL}?report=${report/name}" tal:attributes="href string:${view/requestUrl}?report=${report/name}"
i18n:translate="" i18n:translate=""
tal:content="report/label" /> tal:content="report/label" />
<br /><br /> <br /><br />
@ -223,7 +223,7 @@
</p> </p>
<div class="button" id="show_questionnaire"> <div class="button" id="show_questionnaire">
<a i18n:translate="" <a i18n:translate=""
tal:attributes="href string:${request/URL}${item/urlParamString}"> tal:attributes="href string:${view/requestUrl}${item/urlParamString}">
Back to Questionnaire</a> Back to Questionnaire</a>
<br /> <br />
</div> </div>
@ -278,7 +278,7 @@
</p> </p>
<div class="button" id="show_questionnaire"> <div class="button" id="show_questionnaire">
<a i18n:translate="" <a i18n:translate=""
tal:attributes="href string:${request/URL}${item/urlParamString}"> tal:attributes="href string:${view/requestUrl}${item/urlParamString}">
Back to Questionnaire</a></div> Back to Questionnaire</a></div>
</div> </div>
</metal:block> </metal:block>

2
media/browser/asset.pt
View file

@ -3,7 +3,7 @@
<tal:actions condition="view/showObjectActions"> <tal:actions condition="view/showObjectActions">
<div metal:use-macro="views/node_macros/object_actions" /></tal:actions> <div metal:use-macro="views/node_macros/object_actions" /></tal:actions>
<h1><a tal:omit-tag="python: level > 1" <h1><a tal:omit-tag="python: level > 1"
tal:attributes="href request/URL" tal:attributes="href view/requestUrl"
tal:content="item/title">Title</a></h1><br /> tal:content="item/title">Title</a></h1><br />
<p tal:define="url python: view.getUrlForTarget(item)"> <p tal:define="url python: view.getUrlForTarget(item)">
<a tal:omit-tag="view/isAnonymous" <a tal:omit-tag="view/isAnonymous"

2
organize/tracking/edit_track.pt
View file

@ -4,7 +4,7 @@
<body> <body>
<div metal:fill-slot="body"> <div metal:fill-slot="body">
<form action="." tal:attributes="action request/URL" method="post"> <form action="." tal:attributes="action view/requestUrl" method="post">
<input type="hidden" name="form_submitted" value="true" /> <input type="hidden" name="form_submitted" value="true" />
<h1>Edit Track <span tal:content="view/id" /></h1> <h1>Edit Track <span tal:content="view/id" /></h1>
<div class="row"> <div class="row">