-
Notifications
You must be signed in to change notification settings - Fork 39
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into dictmulti3.0
Conflicts: CHANGES.txt
- Loading branch information
Showing
5 changed files
with
72 additions
and
72 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
<div xmlns="http://www.w3.org/1999/xhtml" | ||
xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
tal:omit-tag=""> | ||
<input id="" name="" value="" class="hidden-widget" title="" | ||
tabindex="" accesskey="" | ||
type="hidden" | ||
tal:attributes="id view/id; | ||
name view/name; | ||
title view/title; | ||
tabindex view/tabindex; | ||
accesskey view/accesskey; | ||
value view/value" /> | ||
</div> | ||
<div xmlns="http://www.w3.org/1999/xhtml" | ||
xmlns:tal="http://xml.zope.org/namespaces/tal" | ||
tal:omit-tag=""> | ||
<input id="" name="" value="" class="hidden-widget" title="" | ||
tabindex="" accesskey="" | ||
type="hidden" | ||
tal:attributes="id view/id; | ||
name view/name; | ||
title view/title; | ||
tabindex view/tabindex; | ||
accesskey view/accesskey; | ||
value view/value" /> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,49 @@ | ||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
<html xmlns="http://www.w3.org/1999/xhtml" | ||
xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
xmlns:tal="http://xml.zope.org/namespaces/tal"> | ||
<body> | ||
<i tal:condition="view/status" tal:content="view/status"/> | ||
<ul tal:condition="view/widgets/errors" | ||
metal:define-macro="errors"> | ||
<li tal:repeat="error view/widgets/errors"> | ||
<tal:block condition="error/widget"> | ||
<tal:block replace="error/widget/label" />: | ||
</tal:block> | ||
<tal:block replace="structure error/render" /> | ||
</li> | ||
</ul> | ||
<form action="."> | ||
<metal:block metal:define-macro="rows"> | ||
<div class="row" | ||
tal:repeat="widget view/widgets/values"> | ||
<b tal:condition="widget/error" | ||
tal:content="structure widget/error/render" /> | ||
<label for="" | ||
tal:attributes="for widget/id" | ||
tal:content="widget/label" /> | ||
<input type="text" tal:replace="structure widget/render" /> | ||
</div> | ||
</metal:block> | ||
<fieldset tal:condition="view/groups|nothing" | ||
tal:repeat="view view/groups"> | ||
<legend tal:condition="view/label" | ||
tal:content="view/label">Label</legend> | ||
<div metal:use-macro="template/macros/errors" /> | ||
<div metal:use-macro="template/macros/rows" /> | ||
<fieldset tal:condition="view/groups|nothing" | ||
tal:repeat="view view/groups"> | ||
<legend tal:condition="view/label" | ||
tal:content="view/label">Label</legend> | ||
<div metal:use-macro="template/macros/errors" /> | ||
<div metal:use-macro="template/macros/rows" /> | ||
</fieldset> | ||
</fieldset> | ||
<div class="action" | ||
tal:condition="view/actions|nothing" | ||
tal:repeat="action view/actions/values"> | ||
<input type="submit" tal:replace="structure action/render" | ||
/></div> | ||
</form> | ||
</body> | ||
</html> | ||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
<html xmlns="http://www.w3.org/1999/xhtml" | ||
xmlns:metal="http://xml.zope.org/namespaces/metal" | ||
xmlns:tal="http://xml.zope.org/namespaces/tal"> | ||
<body> | ||
<i tal:condition="view/status" tal:content="view/status"/> | ||
<ul tal:condition="view/widgets/errors" | ||
metal:define-macro="errors"> | ||
<li tal:repeat="error view/widgets/errors"> | ||
<tal:block condition="error/widget"> | ||
<tal:block replace="error/widget/label" />: | ||
</tal:block> | ||
<tal:block replace="structure error/render" /> | ||
</li> | ||
</ul> | ||
<form action="."> | ||
<metal:block metal:define-macro="rows"> | ||
<div class="row" | ||
tal:repeat="widget view/widgets/values"> | ||
<b tal:condition="widget/error" | ||
tal:content="structure widget/error/render" /> | ||
<label for="" | ||
tal:attributes="for widget/id" | ||
tal:content="widget/label" /> | ||
<input type="text" tal:replace="structure widget/render" /> | ||
</div> | ||
</metal:block> | ||
<fieldset tal:condition="view/groups|nothing" | ||
tal:repeat="view view/groups"> | ||
<legend tal:condition="view/label" | ||
tal:content="view/label">Label</legend> | ||
<div metal:use-macro="template/macros/errors" /> | ||
<div metal:use-macro="template/macros/rows" /> | ||
<fieldset tal:condition="view/groups|nothing" | ||
tal:repeat="view view/groups"> | ||
<legend tal:condition="view/label" | ||
tal:content="view/label">Label</legend> | ||
<div metal:use-macro="template/macros/errors" /> | ||
<div metal:use-macro="template/macros/rows" /> | ||
</fieldset> | ||
</fieldset> | ||
<div class="action" | ||
tal:condition="view/actions|nothing" | ||
tal:repeat="action view/actions/values"> | ||
<input type="submit" tal:replace="structure action/render" | ||
/></div> | ||
</form> | ||
</body> | ||
</html> |