Commit 05b7074a authored by Kevin Deldycke's avatar Kevin Deldycke

Update default web theme to use latests xhtml_style generic macros.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@9474 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 4d22be1f
...@@ -59,8 +59,10 @@ ...@@ -59,8 +59,10 @@
margin: 0;\n margin: 0;\n
}\n }\n
\n \n
.left {float: left}\n html {\n
.right {float: right}\n margin: 1em 10em;\n
}\n
\n
.clear {clear: both}\n .clear {clear: both}\n
\n \n
img {\n img {\n
...@@ -90,8 +92,15 @@ blockquote {\n ...@@ -90,8 +92,15 @@ blockquote {\n
/* layout\n /* layout\n
----------------------------------------------- */\n ----------------------------------------------- */\n
\n \n
fieldset {\n
float: left;\n
}\n
\n \n
\n /* temp colors for debugging */\n
fieldset.center {background: #0eeeee}\n
fieldset.right {background: #ee0eee}\n
fieldset.left {background: #eeee0e}\n
fieldset.bottom {background: #eeeee0}\n
\n \n
\n \n
/* typography & colors (fonts, color, background)\n /* typography & colors (fonts, color, background)\n
...@@ -113,6 +122,10 @@ body, input, textarea, select, table {\n ...@@ -113,6 +122,10 @@ body, input, textarea, select, table {\n
font-weight: bold;\n font-weight: bold;\n
}\n }\n
\n \n
h1 {\n
margin: 1em 0;\n
}\n
\n
\n \n
/* forms styling\n /* forms styling\n
----------------------------------------------- */\n ----------------------------------------------- */\n
...@@ -129,7 +142,7 @@ fieldset {\n ...@@ -129,7 +142,7 @@ fieldset {\n
border-style: dotted none none;\n border-style: dotted none none;\n
}\n }\n
\n \n
fieldset > legend {\n fieldset legend {\n
padding: .5em;\n padding: .5em;\n
margin: 0 0 1em;\n margin: 0 0 1em;\n
text-transform: capitalize;\n text-transform: capitalize;\n
......
...@@ -48,16 +48,55 @@ ...@@ -48,16 +48,55 @@
<key> <string>_text</string> </key> <key> <string>_text</string> </key>
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
<tal:block tal:replace="nothing"\n
xmlns:tal="http://xml.zope.org/namespaces/tal"\n
xmlns:metal="http://xml.zope.org/namespaces/metal"\n
xmlns:i18n="http://xml.zope.org/namespaces/i18n"><!--\n
* Note: If this template is not working, look at erp5_xhtml_style/template_erp5_xhtml_style\n
which is the equivalent of this erp5_web_default_template page template in default\n
erp5 xhtml style.\n
--></tal:block>\n
\n
<tal:block metal:define-macro="master">\n <tal:block metal:define-macro="master">\n
<html>\n \n
<head>\n <tal:block metal:use-macro="here/global_definitions/macros/header_definitions"/>\n
<title tal:content="here/title"/>\n \n
<?xml version="1.0" encoding="UTF-8"?>\n
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">\n
\n
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">\n
<head tal:define="dummy python:request.RESPONSE.setHeader(\'Content-Type\', \'text/html;; charset=utf-8\')">\n
<meta name="generator" content="ERP5"/>\n
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>\n
<title tal:content="template/title_or_id" i18n:translate="" i18n:domain="ui"/>\n
\n
<link rel="stylesheet" type="text/css" media="screen" href="erp5_web_default.css"/>\n <link rel="stylesheet" type="text/css" media="screen" href="erp5_web_default.css"/>\n
<tal:block tal:repeat="css css_list">\n
<link tal:attributes="href css" type="text/css" rel="stylesheet"/>\n
</tal:block>\n
\n
<tal:block metal:use-macro="here/global_definitions/macros/planning_box_definitions"/>\n
\n
<tal:block tal:repeat="js js_list">\n
<script tal:attributes="src js" type="text/javascript"></script>\n
</tal:block>\n
</head>\n </head>\n
\n \n
<body>\n <body>\n
<form id="main_form"\n
tal:attributes="enctype form/enctype | nothing;\n
action url;\n
method form/method | string:post">\n
<tal:block metal:use-macro="here/global_definitions/macros/http_definitions"/>\n
\n
<div id="#header">Website header</div>\n
\n
<h1 tal:content="here/getTitle"/>\n <h1 tal:content="here/getTitle"/>\n
<tal:block metal:define-slot="main"/>\n <tal:block metal:define-slot="main"/>\n
\n
<div id="#footer">Website footer</div>\n
\n
</form>\n
</body>\n </body>\n
\n \n
</html>\n </html>\n
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment