Dave Jarvis' Repositories
git clone https://repo.autonoma.ca/repo/delibero.git
Renamed hypothesis to rationale.
| Author | Dave Jarvis <email> |
|---|---|
| Date | 2015-01-16 18:03:22 GMT-0800 |
| Commit | 9e0df7bdce716efd12bdbc7598c2bac9dc23ff1f |
| Parent | 45163c6 |
resources/database/hypothesis.xml
| -<?xml version="1.0" encoding="utf-8"?> | ||
| -<policy> | ||
| - <summary> | ||
| - <title>Wastewater Treatment Project</title> | ||
| - </summary> | ||
| - <hypotheses> | ||
| - <overview> | ||
| - <paragraph> | ||
| - The geotechnical setting, hydrology, water quality, vegetation and | ||
| - wildlife collectively represent the “environment” study area. Aerial | ||
| - photographs or cursory field inspection demonstrate that past urban | ||
| - development in the study area constitutes a high magnitude, | ||
| - long-term, irreversible impact on the environment that must be | ||
| - considered significant. | ||
| - </paragraph> | ||
| - <paragraph> | ||
| - As the rationale for providing wastewater treatment is to improve | ||
| - environmental quality, cumulative project effects must be assessed. | ||
| - These improvements include: | ||
| - <list> | ||
| - <item> | ||
| - discharge cleaner effluent, with associated long term reductions | ||
| - on sea impacts; | ||
| - </item> | ||
| - <item> | ||
| - replacement of invasive species at Craigflower and Arbutus Road sites | ||
| - and with native flora; | ||
| - </item> | ||
| - <item> | ||
| - reduction of sewer overflows; | ||
| - </item> | ||
| - <item> | ||
| - recover energy for reuse, particularly in the McLoughlin Point | ||
| - facility; and | ||
| - </item> | ||
| - <item> | ||
| - remediation of the contaminated site at McLoughlin Point. | ||
| - </item> | ||
| - </list> | ||
| - </paragraph> | ||
| - </overview> | ||
| - <general> | ||
| - <paragraph> | ||
| - <xref id="1">Fish studies</xref> have discovered high mortality | ||
| - rates in the vicinity of Macaulay Point effluent. Additionally, | ||
| - abnormal oyster and mussel embryo development are prevalent in the | ||
| - same region. These animals are health indicators for the study | ||
| - area's marine life. | ||
| - </paragraph> | ||
| - </general> | ||
| - <directional> | ||
| - <paragraph> | ||
| - The effluent from Macaulay and Clover Point has detrimental effects on | ||
| - marine life, creating a highly toxic dead zone around the expulsion | ||
| - region. | ||
| - </paragraph> | ||
| - </directional> | ||
| - <measurable> | ||
| - <paragraph> | ||
| - If toxicity levels of effluent discharge is reduced by half, then | ||
| - marine life mortality and abnormality rates will decrease proportionally. | ||
| - </paragraph> | ||
| - </measurable> | ||
| - </hypotheses> | ||
| -</policy> | ||
resources/database/rationale.xml
| +<?xml version="1.0" encoding="utf-8"?> | ||
| +<policy> | ||
| + <summary> | ||
| + <title>Wastewater Treatment Project</title> | ||
| + </summary> | ||
| + <hypotheses> | ||
| + <overview> | ||
| + <paragraph> | ||
| + The geotechnical setting, hydrology, water quality, vegetation and | ||
| + wildlife collectively represent the “environment” study area. Aerial | ||
| + photographs or cursory field inspection demonstrate that past urban | ||
| + development in the study area constitutes a high magnitude, | ||
| + long-term, irreversible impact on the environment that must be | ||
| + considered significant. | ||
| + </paragraph> | ||
| + <paragraph> | ||
| + As the rationale for providing wastewater treatment is to improve | ||
| + environmental quality, cumulative project effects must be assessed. | ||
| + These improvements include: | ||
| + <list> | ||
| + <item> | ||
| + discharge cleaner effluent, with associated long term reductions | ||
| + on sea impacts; | ||
| + </item> | ||
| + <item> | ||
| + replacement of invasive species at Craigflower and Arbutus Road sites | ||
| + and with native flora; | ||
| + </item> | ||
| + <item> | ||
| + reduction of sewer overflows; | ||
| + </item> | ||
| + <item> | ||
| + recover energy for reuse, particularly in the McLoughlin Point | ||
| + facility; and | ||
| + </item> | ||
| + <item> | ||
| + remediation of the contaminated site at McLoughlin Point. | ||
| + </item> | ||
| + </list> | ||
| + </paragraph> | ||
| + </overview> | ||
| + <general> | ||
| + <paragraph> | ||
| + <xref id="1">Fish studies</xref> have discovered high mortality | ||
| + rates in the vicinity of Macaulay Point effluent. Additionally, | ||
| + abnormal oyster and mussel embryo development are prevalent in the | ||
| + same region. These animals are health indicators for the study | ||
| + area's marine life. | ||
| + </paragraph> | ||
| + </general> | ||
| + <directional> | ||
| + <paragraph> | ||
| + The effluent from Macaulay and Clover Point has detrimental effects on | ||
| + marine life, creating a highly toxic dead zone around the expulsion | ||
| + region. | ||
| + </paragraph> | ||
| + </directional> | ||
| + <measurable> | ||
| + <paragraph> | ||
| + If toxicity levels of effluent discharge is reduced by half, then | ||
| + marine life mortality and abnormality rates will decrease proportionally. | ||
| + </paragraph> | ||
| + </measurable> | ||
| + </hypotheses> | ||
| +</policy> | ||
source/css/common.css
| } | ||
| +ul.menu { | ||
| + list-style-type: none; | ||
| + padding-left: 0; | ||
| + margin-left: 0; | ||
| + padding-top: 1em; | ||
| + padding-bottom: 1em; | ||
| + text-align: right; | ||
| +} | ||
| + | ||
| +ul.menu > li.item { | ||
| + display: inline; | ||
| + padding-right: 1em; | ||
| +} | ||
| + | ||
| + |
source/css/hypothesis.css
| -@charset "utf-8"; | ||
| - | ||
| -@import url( "edit-discuss-flag.css" ); | ||
| -@import url( "xref.css" ); | ||
| -@import url( "list.css" ); | ||
| - | ||
| -.policy { | ||
| - padding-bottom: 0.5em; | ||
| - border-bottom: 1px solid black; | ||
| -} | ||
| - | ||
| -.policy, .title { | ||
| - border-bottom: 1px solid black; | ||
| -} | ||
| - | ||
| -.paragraph { | ||
| - margin-bottom: 0.5em; | ||
| -} | ||
| - | ||
| -.hypotheses > .general::before { | ||
| - content: "General Hypothesis"; | ||
| -} | ||
| - | ||
| -.hypotheses > .directional::before { | ||
| - content: "Directional Hypothesis"; | ||
| -} | ||
| - | ||
| -.hypotheses > .measurable::before { | ||
| - content: "Measurable Hypothesis"; | ||
| -} | ||
| - | ||
| -.hypotheses > *::before { | ||
| - font-family: 'Montserrat', Helvetica, sans-serif; | ||
| - font-size: 1.2em; | ||
| - font-weight: bold; | ||
| -} | ||
| - | ||
| -.hypotheses > * > .paragraph { | ||
| - padding-top: 0.5em; | ||
| - padding-bottom: 0.5em; | ||
| -} | ||
source/css/rationale.css
| +@charset "utf-8"; | ||
| + | ||
| +@import url( "edit-discuss-flag.css" ); | ||
| +@import url( "xref.css" ); | ||
| +@import url( "list.css" ); | ||
| + | ||
| +.policy { | ||
| + padding-bottom: 0.5em; | ||
| + border-bottom: 1px solid black; | ||
| +} | ||
| + | ||
| +.policy, .title { | ||
| + border-bottom: 1px solid black; | ||
| +} | ||
| + | ||
| +.paragraph { | ||
| + margin-bottom: 0.5em; | ||
| +} | ||
| + | ||
| +.hypotheses > .general::before { | ||
| + content: "General Hypothesis"; | ||
| +} | ||
| + | ||
| +.hypotheses > .directional::before { | ||
| + content: "Directional Hypothesis"; | ||
| +} | ||
| + | ||
| +.hypotheses > .measurable::before { | ||
| + content: "Measurable Hypothesis"; | ||
| +} | ||
| + | ||
| +.hypotheses > *::before { | ||
| + font-family: 'Montserrat', Helvetica, sans-serif; | ||
| + font-size: 1.2em; | ||
| + font-weight: bold; | ||
| +} | ||
| + | ||
| +.hypotheses > * > .paragraph { | ||
| + padding-top: 0.5em; | ||
| + padding-bottom: 0.5em; | ||
| +} | ||
source/css/synopsis.css
| } | ||
| +.implications { | ||
| + border-bottom: 1px solid black; | ||
| +} | ||
| + | ||
| .implications::before { | ||
| - content: "Implications"; | ||
| + content: "Discussion"; | ||
| font-family: 'Montserrat', Helvetica, sans-serif; | ||
| - font-size: 1.5em; | ||
| + font-size: 1.25em; | ||
| font-weight: bold; | ||
| } | ||
 | ||
| float: left; | ||
| margin-right: 0.5em; | ||
| + padding-left: 0.5em; | ||
| } | ||
| .implication > .support > a::before { | ||
| content: "▶"; | ||
| -} | ||
| - | ||
| -.related { | ||
| - padding-bottom: 0.5em; | ||
| - border-bottom: 1px solid black; | ||
| - width: 100%; | ||
| -} | ||
| - | ||
| -.proposal { order: 1; } | ||
| -.resources { order: 2; } | ||
| -.hypothesis { order: 3; } | ||
| -.discuss { order: 4; } | ||
| - | ||
| -.proposal::after, .resources::after, .hypothesis::after { | ||
| - content: "|"; | ||
| - padding-right: 3px; | ||
| } | ||
| -.proposal > a::before { content: "proposal"; } | ||
| -.resources > a::before { content: "resources"; } | ||
| -.hypothesis > a::before { content: "hypothesis"; } | ||
| -.discuss > a::before { content: "implications"; } | ||
| -.flag > a::before { content: "flag"; } | ||
source/xsl/account.xsl
| <artefacts> | ||
| <css>account</css> | ||
| + <menu> | ||
| + <item>home</item> | ||
| + </menu> | ||
| </artefacts> | ||
| </xsl:variable> |
source/xsl/common.xsl
| <xsl:strip-space elements="*"/> | ||
| -<!-- Custom URI resolver to import an XSL file corresponding to the app. --> | ||
| +<!-- Custom URI resolver imports the corresponding app stylesheet. --> | ||
| <xsl:include href="template://discuss.to/app"/> | ||
| <!-- Action parser that responds to HTTP requests. --> | ||
| -<xsl:param name="action" select="'app'"/> | ||
| +<xsl:param name="CONTEXT" select="'app'"/> | ||
| <xsl:template match="/"> | ||
| ||
| </head> | ||
| <body> | ||
| + <xsl:apply-templates select="$artefacts" mode="menu"/> | ||
| <xsl:apply-templates/> | ||
| + <xsl:apply-templates select="$artefacts" mode="menu"/> | ||
| <xsl:apply-templates select="$artefacts" mode="js"/> | ||
| </body> | ||
| ||
| <xsl:template match="*[@id]"> | ||
| <div class="{local-name()}"><a | ||
| - href="/{$action}/{local-name()}/{@id}"><xsl:apply-templates | ||
| + href="/{$CONTEXT}/{local-name()}/{@id}"><xsl:apply-templates | ||
| select="node()|*"/></a></div> | ||
| </xsl:template> | ||
| ||
| <xsl:template match="@*"> | ||
| <xsl:if test="name() != 'class'"><xsl:copy-of select="."/></xsl:if> | ||
| +</xsl:template> | ||
| + | ||
| +<xsl:template match="artefacts" mode="menu"> | ||
| + <xsl:apply-templates select="menu" mode="menu"/> | ||
| +</xsl:template> | ||
| + | ||
| +<xsl:template match="menu" mode="menu"> | ||
| + <ul class="menu"><xsl:apply-templates mode="menu"/></ul> | ||
| +</xsl:template> | ||
| + | ||
| +<xsl:template match="item" mode="menu"> | ||
| + <li class="item"><a href="/{$CONTEXT}/{.}/"><xsl:apply-templates/></a></li> | ||
| </xsl:template> | ||
source/xsl/pages.xsl
| -<?xml version="1.0" encoding="utf-8"?> | ||
| -<!-- | ||
| - | MIT License | ||
| - | | ||
| - | Copyright 2014 White Magic Software, Inc. | ||
| - +--> | ||
| -<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> | ||
| - | ||
| -<xsl:strip-space elements="*"/> | ||
| - | ||
| -<xsl:output method="text"/> | ||
| -<xsl:output method="html" indent="yes" name="html" encoding="utf-8"/> | ||
| - | ||
| -<xsl:template match="/"> | ||
| - <xsl:apply-templates/> | ||
| -</xsl:template> | ||
| - | ||
| -<xsl:template match="page"> | ||
| -<xsl:result-document href="{@file}.html" format="html"> | ||
| -<html> | ||
| -<head> | ||
| - <meta charset="utf-8"/> | ||
| - <link rel="stylesheet" type="text/css" href="css/tour.css"/> | ||
| -</head> | ||
| -<body> | ||
| -<div class="header"> | ||
| - <xsl:if test="position() > 1"> | ||
| - <a class="page-prev" href="{preceding-sibling::page[1]/@file}.html">Previous</a> | ||
| - </xsl:if> | ||
| - <xsl:if test="position() < last()"> | ||
| - <a class="page-next" href="{following-sibling::page[1]/@file}.html">Next</a> | ||
| - </xsl:if> | ||
| -</div> | ||
| -<hr/> | ||
| - <iframe id="page" src="{@file}.xml" width="100%" height="100%" frameborder="0"> | ||
| - </iframe> | ||
| -</body> | ||
| -</html> | ||
| -</xsl:result-document> | ||
| -</xsl:template> | ||
| - | ||
| -</xsl:stylesheet> | ||
| - | ||
source/xsl/proposal.xsl
| <artefacts> | ||
| <css>proposal</css> | ||
| + <menu> | ||
| + <item>home</item> | ||
| + <item>edit</item> | ||
| + <item>resources</item> | ||
| + <item>discuss</item> | ||
| + <item>rationale</item> | ||
| + </menu> | ||
| </artefacts> | ||
| </xsl:variable> |
source/xsl/rationale.xsl
| +<?xml version="1.0" encoding="utf-8"?> | ||
| +<!-- | ||
| + | MIT License | ||
| + | | ||
| + | Copyright 2014 White Magic Software, Inc. | ||
| + +--> | ||
| +<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> | ||
| + | ||
| +<xsl:variable name="artefacts"> | ||
| +<artefacts> | ||
| + <css>rationale</css> | ||
| + <menu> | ||
| + <item>home</item> | ||
| + <item>proposal</item> | ||
| + <item>discuss</item> | ||
| + <item>rationale</item> | ||
| + </menu> | ||
| +</artefacts> | ||
| +</xsl:variable> | ||
| + | ||
| +</xsl:stylesheet> | ||
source/xsl/resources.xsl
| <artefacts> | ||
| <css>resources</css> | ||
| + <menu> | ||
| + <item>home</item> | ||
| + <item>proposal</item> | ||
| + <item>discuss</item> | ||
| + <item>rationale</item> | ||
| + <item>flag</item> | ||
| + </menu> | ||
| </artefacts> | ||
| </xsl:variable> |
source/xsl/support.xsl
| <js>editor.min</js> | ||
| <js>support</js> | ||
| + <menu> | ||
| + <item>home</item> | ||
| + <item>proposal</item> | ||
| + <item>discuss</item> | ||
| + <item>rationale</item> | ||
| + <item>flag</item> | ||
| + </menu> | ||
| </artefacts> | ||
| </xsl:variable> |
source/xsl/synopsis.xsl
| <artefacts> | ||
| <css>synopsis</css> | ||
| + <menu> | ||
| + <item>home</item> | ||
| + <item>proposal</item> | ||
| + <item>resources</item> | ||
| + <item>discuss</item> | ||
| + <item>rationale</item> | ||
| + </menu> | ||
| </artefacts> | ||
| </xsl:variable> |
| Delta | 197 lines added, 175 lines removed, 22-line increase |
|---|