# HG changeset patch # User Valentin Bartenev # Date 1411747367 -14400 # Node ID 59f7fb43e39c398f46c4dc5986bd4c8f761ab22d # Parent f0383f5cfbb8d4fbca7c42ddceb51e634345df3c Design: used generic layout for error pages. diff -r f0383f5cfbb8 -r 59f7fb43e39c GNUmakefile --- a/GNUmakefile Fri Sep 26 19:12:57 2014 +0400 +++ b/GNUmakefile Fri Sep 26 20:02:47 2014 +0400 @@ -151,12 +151,9 @@ $(OUT)/404.html: \ xml/404.xml \ - xml/menu.xml \ + $(COMMON_DEPS) \ dtd/error.dtd \ - xslt/error.xslt \ - xslt/dirname.xslt \ - xslt/menu.xslt \ - xslt/ga.xslt + xslt/error.xslt $(call XSLT, xslt/error.xslt, $<, $@) $(OUT)/%.html: xml/%.xml \ diff -r f0383f5cfbb8 -r 59f7fb43e39c xsls/error.xsls --- a/xsls/error.xsls Fri Sep 26 19:12:57 2014 +0400 +++ b/xsls/error.xsls Fri Sep 26 20:02:47 2014 +0400 @@ -15,46 +15,32 @@ --> X:param XML = "'../xml'"; X:param YEAR; +X:param ORIGIN; X:param TRANS; X:var LINK = "/error/@link"; X:var LANG = "/error/@lang"; X:include href = "dirname.xslt"; +X:include href = "link.xslt"; +X:include href = "style.xslt"; +X:include href = "body.xslt"; X:include href = "menu.xslt"; X:include href = "ga.xslt"; +X:include href = "content.xslt"; X:template = "/error" { !{@name} - + !style (lang="@lang") !ga () - - - - - - -

!{@name}

- nginx
+ !body (lang="@lang") -
-
- - !! "document(concat($XML, '/menu.xml')) - /menus/menu[@lang = current()/@lang]/item"; -
- }