[MKDoc-commit] Layout and css and logo features back ported from 1.8
chris at mkdoc.demon.co.uk
chris at mkdoc.demon.co.uk
Thu Feb 3 16:36:27 GMT 2005
Log Message:
-----------
Layout and css and logo features back ported from 1.8
Tags:
----
mkdoc-1-6
Modified Files:
--------------
mkd/templates/document/default:
en.html
mkd/templates/document/default_child_listing_bottom:
en.html
mkd/templates/document/default_child_listing_top:
en.html
mkd/templates/document/default_front_page:
en.html
mkd/templates/document/default_inline_links:
en.html
mkd/templates/document/default_link_listing_bottom:
en.html
mkd/templates/document/default_link_listing_top:
en.html
mkd/templates/fragments/header:
en.html
mkd/templates/fragments/logo:
en.html
-------------- next part --------------
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/document/default_child_listing_top/Attic/en.html,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -Ltemplates/document/default_child_listing_top/en.html -Ltemplates/document/default_child_listing_top/en.html -u -r1.1.2.11 -r1.1.2.12
--- templates/document/default_child_listing_top/en.html
+++ templates/document/default_child_listing_top/en.html
@@ -59,6 +59,9 @@
<!--? This is the header it contains the navigational elements at the top of the page. ?-->
<?include file="/fragments/header/"?>
+<!--? This is the documents side navigation bar. ?-->
+<?include file="/fragments/sidebar/"?>
+
<div class="content">
<h1
lang="en"
@@ -138,9 +141,6 @@
</div>
- <!--? This is the documents side navigation bar. ?-->
- <?include file="/fragments/sidebar/"?>
-
</body>
</html>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/document/default/Attic/en.html,v
retrieving revision 1.6.2.52
retrieving revision 1.6.2.53
diff -Ltemplates/document/default/en.html -Ltemplates/document/default/en.html -u -r1.6.2.52 -r1.6.2.53
--- templates/document/default/en.html
+++ templates/document/default/en.html
@@ -59,6 +59,9 @@
<!--? This is the header it contains the navigational elements at the top of the page. ?-->
<?include file="/fragments/header/"?>
+<!--? This is the documents side navigation bar. ?-->
+<?include file="/fragments/sidebar/"?>
+
<div class="content">
<h1
lang="en"
@@ -99,9 +102,6 @@
</div>
- <!--? This is the documents side navigation bar. ?-->
- <?include file="/fragments/sidebar/"?>
-
</body>
</html>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/document/default_front_page/Attic/en.html,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -Ltemplates/document/default_front_page/en.html -Ltemplates/document/default_front_page/en.html -u -r1.1.2.8 -r1.1.2.9
--- templates/document/default_front_page/en.html
+++ templates/document/default_front_page/en.html
@@ -61,39 +61,6 @@
<!--? This is the header it contains the navigational elements at the top of the page. ?-->
<?include file="/fragments/header/"?>
- <div class="content">
- <!-- The H1 is omitted for the front page -->
- <br />
- <a
- id="page_content"
- name="page_content"
- ></a>
- <br />
-
- <div
- class="mkdoc-content"
- >
- <div
- petal:repeat="component Body_Loop"
- petal:omit-tag="string:1"
- >
- <div
- petal:condition="false:component/isa --flo::editor::File"
- petal:replace="structure component/as_xhtml"
- >
- Page Content Goes Here
- </div>
- </div>
- </div>
-
- <!--? This is the next and previous menu. ?-->
- <?include file="/fragments/menu_next_prev/"?>
-
- <!--? This is the documents footnote. ?-->
- <?include file="/fragments/footnote/"?>
-
- </div>
-
<div
class="sidebar"
>
@@ -457,6 +424,39 @@
</div>
+ <div class="content">
+ <!-- The H1 is omitted for the front page -->
+ <br />
+ <a
+ id="page_content"
+ name="page_content"
+ ></a>
+ <br />
+
+ <div
+ class="mkdoc-content"
+ >
+ <div
+ petal:repeat="component Body_Loop"
+ petal:omit-tag="string:1"
+ >
+ <div
+ petal:condition="false:component/isa --flo::editor::File"
+ petal:replace="structure component/as_xhtml"
+ >
+ Page Content Goes Here
+ </div>
+ </div>
+ </div>
+
+ <!--? This is the next and previous menu. ?-->
+ <?include file="/fragments/menu_next_prev/"?>
+
+ <!--? This is the documents footnote. ?-->
+ <?include file="/fragments/footnote/"?>
+
+ </div>
+
</body>
</html>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/document/default_inline_links/Attic/en.html,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Ltemplates/document/default_inline_links/en.html -Ltemplates/document/default_inline_links/en.html -u -r1.1.2.10 -r1.1.2.11
--- templates/document/default_inline_links/en.html
+++ templates/document/default_inline_links/en.html
@@ -59,6 +59,9 @@
<!--? This is the header it contains the navigational elements at the top of the page. ?-->
<?include file="/fragments/header/"?>
+<!--? This is the documents side navigation bar. ?-->
+<?include file="/fragments/sidebar/"?>
+
<div class="content">
<h1
lang="en"
@@ -101,9 +104,6 @@
</div>
- <!--? This is the documents side navigation bar. ?-->
- <?include file="/fragments/sidebar/"?>
-
</body>
</html>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/document/default_link_listing_bottom/Attic/en.html,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -Ltemplates/document/default_link_listing_bottom/en.html -Ltemplates/document/default_link_listing_bottom/en.html -u -r1.1.2.11 -r1.1.2.12
--- templates/document/default_link_listing_bottom/en.html
+++ templates/document/default_link_listing_bottom/en.html
@@ -59,6 +59,9 @@
<!--? This is the header it contains the navigational elements at the top of the page. ?-->
<?include file="/fragments/header/"?>
+<!--? This is the documents side navigation bar. ?-->
+<?include file="/fragments/sidebar/"?>
+
<div class="content">
<h1
lang="en"
@@ -131,9 +134,6 @@
</div>
- <!--? This is the documents side navigation bar. ?-->
- <?include file="/fragments/sidebar/"?>
-
</body>
</html>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/document/default_link_listing_top/Attic/en.html,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -Ltemplates/document/default_link_listing_top/en.html -Ltemplates/document/default_link_listing_top/en.html -u -r1.1.2.10 -r1.1.2.11
--- templates/document/default_link_listing_top/en.html
+++ templates/document/default_link_listing_top/en.html
@@ -59,6 +59,9 @@
<!--? This is the header it contains the navigational elements at the top of the page. ?-->
<?include file="/fragments/header/"?>
+<!--? This is the documents side navigation bar. ?-->
+<?include file="/fragments/sidebar/"?>
+
<div class="content">
<h1
lang="en"
@@ -131,9 +134,6 @@
</div>
- <!--? This is the documents side navigation bar. ?-->
- <?include file="/fragments/sidebar/"?>
-
</body>
</html>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/fragments/header/Attic/en.html,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -Ltemplates/fragments/header/en.html -Ltemplates/fragments/header/en.html -u -r1.1.2.4 -r1.1.2.5
--- templates/fragments/header/en.html
+++ templates/fragments/header/en.html
@@ -11,12 +11,12 @@
<?include file="/fragments/menu_no_css/"?>
- <?include file="/fragments/logo/"?>
-
<?include file="/fragments/menu/"?>
<?include file="/fragments/search/"?>
+ <?include file="/fragments/logo/"?>
+
<?include file="/fragments/bread-crumb-trail"?>
</div>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/document/default_child_listing_bottom/Attic/en.html,v
retrieving revision 1.1.2.14
retrieving revision 1.1.2.15
diff -Ltemplates/document/default_child_listing_bottom/en.html -Ltemplates/document/default_child_listing_bottom/en.html -u -r1.1.2.14 -r1.1.2.15
--- templates/document/default_child_listing_bottom/en.html
+++ templates/document/default_child_listing_bottom/en.html
@@ -59,6 +59,9 @@
<!--? This is the header it contains the navigational elements at the top of the page. ?-->
<?include file="/fragments/header/"?>
+<!--? This is the documents side navigation bar. ?-->
+<?include file="/fragments/sidebar/"?>
+
<div class="content">
<h1
lang="en"
@@ -134,9 +137,6 @@
<?include file="/fragments/footnote/"?>
</div>
- <!--? This is the documents side navigation bar. ?-->
- <?include file="/fragments/sidebar/"?>
-
</body>
</html>
Index: en.html
===================================================================
RCS file: /var/spool/cvs/mkd/templates/fragments/logo/Attic/en.html,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -Ltemplates/fragments/logo/en.html -Ltemplates/fragments/logo/en.html -u -r1.1.2.9 -r1.1.2.10
--- templates/fragments/logo/en.html
+++ templates/fragments/logo/en.html
@@ -8,28 +8,28 @@
class="logo"
xmlns:petal="http://purl.org/petal/1.0/"
>
- <p
- dir="ltr"
- xml:lang="en"
- lang="en"
- petal:content="self/root/title"
- petal:attributes="dir root_dir; xml:lang root_lang; lang root_lang"
- petal:condition="true: self/cgi/path_info_eq '/'"
- >
- MKDoc
- </p>
- <p
- petal:condition="false: self/cgi/path_info_eq '/'"
- >
- <a
- href="/"
- dir="ltr"
- xml:lang="en"
- lang="en"
- hreflang="en"
- petal:attributes="href root_uri; hreflang root_lang;
- dir root_dir; xml:lang root_lang; lang root_lang"
- petal:content="self/root/title"
- >MKDoc</a>
- </p>
+
+ <a
+ href="/"
+ hreflang="en"
+ title="Home Page Title"
+ petal:attributes="href self/root/uri;
+ hreflang self/root/lang;
+ title self/root/title"
+ petal:omit-tag="true: self/cgi/path_info_eq '/'"
+ ><img
+ src="/.static/css/logo.png"
+ alt="MKDoc"
+ border="0"
+ petal:attributes="alt self/root/title"
+ petal:omit-tag="true: self/root/get --logo.png"
+ /><img
+ src="/logo.png"
+ alt="MKDoc"
+ border="0"
+ petal:attributes="alt self/root/title;
+ src string:${self/root/uri}logo.png"
+ petal:omit-tag="false: self/root/get --logo.png"
+ />
+ </a>
</div>
More information about the MKDoc-commit
mailing list