Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/dita-ot/footer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<!-- GitHub -->
<a
class="btn m-1"
href="https://github.com/infotexture/dita-bootstrap"
href="https://github.com/dita-bootstrap/dita-bootstrap.html"
role="button"
style="background-color: #333333;"
>
Expand Down
11 changes: 7 additions & 4 deletions .github/dita-ot/header.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@
<i class="bi bi-list"/>
</button>
</div>
<a class="navbar-brand" href="https://infotexture.github.io/dita-bootstrap">
<a
class="navbar-brand"
href="https://dita-bootstrap.github.io/dita-bootstrap.html"
>
<svg
xmlns="http://www.w3.org/2000/svg"
width="16"
Expand Down Expand Up @@ -48,19 +51,19 @@
<li class="nav-item">
<a
class="nav-link"
href="https://www.dita-ot.org/plugins#!net.infotexture.dita-bootstrap"
href="https://www.dita-ot.org/plugins#!org.dita-bootstrap.html"
>Plugin</a>
</li>
<li class="nav-item">
<a
class="nav-link"
href="https://github.com/infotexture/dita-bootstrap/releases"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/releases"
>Releases</a>
</li>
<li class="nav-item">
<a
class="nav-link"
href="https://github.com/infotexture/dita-bootstrap"
href="https://github.com/dita-bootstrap/dita-bootstrap.html"
>Source</a>
</li>
<li class="nav-item">
Expand Down
5 changes: 1 addition & 4 deletions .github/dita-ot/html.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@
<param name="popovers.include" value="yes"/>
<param name="dark.mode.include" value="yes"/>
<param name="css.theme.switcher" value="yes"/>
<param
name="open-graph.url"
value="https://infotexture.github.io/dita-bootstrap"
/>
<param name="open-graph.url" value="https://dita-bootstrap.github.io"/>
Comment thread
infotexture marked this conversation as resolved.
<param name="twitter.site" value="@infotexture"/>
</publication>
</deliverable>
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ DITA-OT 3.5 and newer:

```console
dita install fox.jason.extend.css
dita install net.infotexture.dita-bootstrap
dita install org.dita-bootstrap.html
```

DITA-OT 3.3 and newer:

```console
dita --install fox.jason.extend.css
dita --install net.infotexture.dita-bootstrap
dita --install org.dita-bootstrap.html
```

DITA-OT 3.2 and older:
Expand All @@ -45,7 +45,7 @@ DITA-OT 3.2 and older:
dita --install \
https://github.com/jason-fox/fox.jason.extend.css/archive/master.zip
dita --install \
https://github.com/infotexture/dita-bootstrap/archive/master.zip
https://github.com/dita-bootstrap/dita-bootstrap.html/archive/master.zip
```

## Using
Expand Down Expand Up @@ -145,7 +145,7 @@ dita --input=path/to/your.ditamap \
--nav-toc=list-group-partial
```

For an example of `collapsible` styling, see the output at [infotexture.github.io/dita-bootstrap][15].
For an example of `collapsible` styling, see the output at [dita-bootstrap.github.io][15].

Additionally, the first-level navigation menu can be switched to a horizontal Bootstrap menu bar to reduce the depth of the ToC.

Expand Down Expand Up @@ -248,7 +248,7 @@ Within the sample documentation, where necessary, the texts describing the usage
[2]: https://getbootstrap.com/docs/5.3
[3]: https://bootswatch.com
[4]: https://sass-lang.com
[5]: https://github.com/infotexture/dita-bootstrap.sass
[5]: https://github.com/dita-bootstrap/dita-bootstrap.sass
[6]: https://getbootstrap.com/docs/5.3/examples/navbars/
[7]: https://getbootstrap.com/docs/5.3/examples/headers/
[8]: ./includes/hdr.navbar.example.xml
Expand All @@ -258,9 +258,9 @@ Within the sample documentation, where necessary, the texts describing the usage
[12]: https://getbootstrap.com/docs/5.3/components/list-group/
[13]: https://getbootstrap.com/docs/5.3/components/collapse/
[14]: https://getbootstrap.com/docs/5.3/customize/color-modes/#dark-mode
[15]: https://infotexture.github.io/dita-bootstrap
[15]: https://dita-bootstrap.github.io
[16]: ./xsl/html5-bootstrap-template.xsl
[17]: https://getbootstrap.com/docs/5.3/components/scrollspy/
[18]: https://indieweb.social/@infotexture
[19]: https://github.com/infotexture/dita-bootstrap/issues/new
[19]: https://github.com/dita-bootstrap/dita-bootstrap.html/issues/new
[20]: https://help.github.com/articles/using-pull-requests/
22 changes: 11 additions & 11 deletions build_dita2html5-bootstrap_template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<target name="dita-bootstrap.css.copy" description="Copy CSS files">
<property
name="dita-bootstrap.css.dir"
value="${dita.plugin.net.infotexture.dita-bootstrap.dir}/css/"
value="${dita.plugin.org.dita-bootstrap.html.dir}/css/"
/>

<!-- Add Common CSS where Bootstrap variables override DITA-OT defaults -->
Expand Down Expand Up @@ -130,7 +130,7 @@
<mkdir dir="${dita.output.dir}/js"/>
<copy todir="${dita.output.dir}/js">
<fileset
dir="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes"
dir="${dita.plugin.org.dita-bootstrap.html.dir}/includes"
includes="popovers.js"
/>
</copy>
Expand All @@ -141,7 +141,7 @@
<mkdir dir="${dita.output.dir}/js"/>
<copy todir="${dita.output.dir}/js">
<fileset
dir="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes"
dir="${dita.plugin.org.dita-bootstrap.html.dir}/includes"
includes="dark-mode-toggler.js"
/>
</copy>
Expand All @@ -151,12 +151,12 @@
<!-- Location of page header template with hard-coded links -->
<property
name="args.hdr"
location="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes/hdr.navbar.default.xml"
location="${dita.plugin.org.dita-bootstrap.html.dir}/includes/hdr.navbar.default.xml"
/>
<!-- Location of bootstrap icons if required -->
<makeurl
property="icons.cdn.path"
file="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes/bootstrap.icons.hdf.xml"
file="${dita.plugin.org.dita-bootstrap.html.dir}/includes/bootstrap.icons.hdf.xml"
/>
<!--
For DITA-OT 3.0, 3.1 and 3.2 import a version of the
Expand All @@ -176,7 +176,7 @@
<!-- Entrypoint for XSL transforms -->
<property
name="args.xsl"
location="${dita.plugin.net.infotexture.dita-bootstrap.dir}/xsl/dita2html5-${bootstrap.xsl}"
location="${dita.plugin.org.dita-bootstrap.html.dir}/xsl/dita2html5-${bootstrap.xsl}"
/>

<makeurl
Expand Down Expand Up @@ -218,8 +218,8 @@
</condition>
<condition
property="args.hdf"
value="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes/bootstrap.hdf.rtl.xml"
else="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes/bootstrap.hdf.xml"
value="${dita.plugin.org.dita-bootstrap.html.dir}/includes/bootstrap.hdf.rtl.xml"
else="${dita.plugin.org.dita-bootstrap.html.dir}/includes/bootstrap.hdf.xml"
>
<equals arg1="${bidi.include}" arg2="yes"/>
</condition>
Expand Down Expand Up @@ -251,8 +251,8 @@
/>
<condition
property="bootstrap.template.file"
value="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes/script-only.hdf.xml"
else="${dita.plugin.net.infotexture.dita-bootstrap.dir}/includes/theme.hdf.xml"
value="${dita.plugin.org.dita-bootstrap.html.dir}/includes/script-only.hdf.xml"
else="${dita.plugin.org.dita-bootstrap.html.dir}/includes/theme.hdf.xml"
>
<equals arg1="${bootstrap.theme}" arg2="none"/>
</condition>
Expand Down Expand Up @@ -286,7 +286,7 @@
/>
<property name="args.hdf" value="${bootstrap.theme.file}"/>
<property
file="${dita.plugin.net.infotexture.dita-bootstrap.dir}/cfg/${bootstrap.theme}.properties"
file="${dita.plugin.org.dita-bootstrap.html.dir}/cfg/${bootstrap.theme}.properties"
/>
</target>
</project>
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "dita-bootstrap",
"description": "DITA Open Toolkit plug-in for HTML5 output with extensible Bootstrap style",
"homepage": "https://infotexture.github.io/dita-bootstrap",
"homepage": "https://dita-bootstrap.github.io",
"repository": {
"type": "git",
"url": "https://github.com/infotexture/dita-bootstrap.git"
"url": "https://github.com/dita-bootstrap/dita-bootstrap.html.git"
},
"license": "Apache-2.0",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<?xml-model href="https://www.dita-ot.org/rng/plugin.rnc" type="application/relax-ng-compact-syntax"?>
<!-- Copyright © 2017 · infotexture · Roger W. Fienhold Sheen -->
<!-- See the accompanying LICENSE file for applicable license -->
<plugin id="net.infotexture.dita-bootstrap">
<plugin id="org.dita-bootstrap.html">
<feature extension="package.version" value="5.3.8"/>
<require plugin="org.dita.html5"/>
<!--require plugin="com.dita-bootstrap.specialization"/-->
Expand Down
6 changes: 3 additions & 3 deletions sample/bootstrap-extension.dita
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
images and additional styling options such as new colors.</p>
<p>For the full documentation, see
<xref
href="https://infotexture.github.io/dita-bootstrap.extension/"
href="https://dita-bootstrap.github.io/dita-bootstrap.extension/"
format="html"
scope="external"
>infotexture.github.io/dita-bootstrap.extension</xref>.</p>
>dita-bootstrap.github.io/dita-bootstrap.extension</xref>.</p>

<fig>
<title>Additional Bootstrap Extension Colors</title>
Expand All @@ -38,7 +38,7 @@
<p>Use the <cmdname>dita</cmdname> command to add the <term>DITA Bootstrap Extension</term>
plug-in to your DITA Open Toolkit installation:</p>
<codeblock outputclass="language-bash"><cmdname>dita</cmdname> <parmname
>install</parmname> net.infotexture.dita-bootstrap.extension</codeblock>
>install</parmname> org.dita-bootstrap.extension</codeblock>
</section>
</body>
</topic>
6 changes: 3 additions & 3 deletions sample/bootstrap-table.dita
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@
and adds the necessary CSS and JavaScript for dynamic tables with search, sort, and pagination functions.</p>
<p>For the full documentation, see
<xref
href="https://infotexture.github.io/dita-bootstrap.table/"
href="https://dita-bootstrap.github.io/dita-bootstrap.table/"
format="html"
scope="external"
>infotexture.github.io/dita-bootstrap.table</xref>.</p>
>dita-bootstrap.github.io/dita-bootstrap.table</xref>.</p>
<note type="note">If you just want to style DITA tables with the standard Bootstrap table styles, you don’t need a
separate plug-in. See <xref href="tables.dita"/> for details on the output classes that the
<term>DITA Bootstrap</term> plug-in supports.</note>
Expand All @@ -38,7 +38,7 @@
<p>Use the <cmdname>dita</cmdname> command to add the <term>DITA Bootstrap Table</term>
plug-in to your DITA Open Toolkit installation:</p>
<codeblock outputclass="language-bash"><cmdname>dita</cmdname> <parmname
>install</parmname> net.infotexture.dita-bootstrap.table</codeblock>
>install</parmname> org.dita-bootstrap.table</codeblock>
</section>

<section>
Expand Down
2 changes: 1 addition & 1 deletion sample/dark-mode.dita
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
&lt;/ul&gt;</codeblock>
<p>The plug-in includes a sample color mode toggler in its
<xref
href="https://github.com/infotexture/dita-bootstrap/blob/develop/includes/hdr.navbar.example.xml"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/blob/develop/includes/hdr.navbar.example.xml"
format="html"
scope="external"
>header navbar</xref>.</p>
Expand Down
2 changes: 1 addition & 1 deletion sample/icons.dita
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
<xref href="https://octicons.github.com/" format="html" scope="external">Octicons</xref> are available. To use
an alternative set of icons, modify the
<xref
href="https://github.com/infotexture/dita-bootstrap/blob/master/includes/bootstrap.icons.hdf.xml"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/blob/master/includes/bootstrap.icons.hdf.xml"
format="html"
scope="external"
>sample header</xref> or specify the path of the Icons CDN file using the
Expand Down
22 changes: 9 additions & 13 deletions sample/index.dita
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@
<title>DITA-OT 3.5 and newer:</title>
<codeblock outputclass="language-bash"><cmdname>dita</cmdname> <parmname
>install</parmname> fox.jason.extend.css
<cmdname>dita</cmdname> <parmname>install</parmname> net.infotexture.dita-bootstrap</codeblock>
<cmdname>dita</cmdname> <parmname>install</parmname> org.dita-bootstrap.html</codeblock>
</section>
<section>
<title>DITA-OT 3.3 and newer:</title>
<codeblock outputclass="language-bash"><cmdname>dita</cmdname> <parmname
>--install</parmname> fox.jason.extend.css
<cmdname>dita</cmdname> <parmname>--install</parmname> net.infotexture.dita-bootstrap</codeblock>
<cmdname>dita</cmdname> <parmname>--install</parmname> org.dita-bootstrap.html</codeblock>
</section>
<section>
<title>DITA-OT 3.2 and older:</title>
<codeblock outputclass="language-bash"><cmdname>dita</cmdname> <parmname
>--install</parmname> https://github.com/jason-fox/fox.jason.extend.css/archive/master.zip
<cmdname>dita</cmdname> <parmname
>--install</parmname> https://github.com/infotexture/dita-bootstrap/archive/master.zip</codeblock>
>--install</parmname> https://github.com/dita-bootstrap/dita-bootstrap.html/archive/master.zip</codeblock>
</section>
</bodydiv>
<section>
Expand Down Expand Up @@ -452,11 +452,7 @@
</li>
</ol>
<note type="note">You can switch between the available themes via the CSS dropdown in the menu bar at
<xref
href="https://infotexture.github.io/dita-bootstrap/"
format="html"
scope="external"
>infotexture.github.io/dita-bootstrap</xref>.
<xref href="https://dita-bootstrap.github.io/" format="html" scope="external">dita-bootstrap.github.io</xref>.
</note>
</section>
<section>
Expand All @@ -482,7 +478,7 @@
<note type="tip">For more extensive customizations with
<xref href="https://sass-lang.com" format="html" scope="external">Sass</xref>, you may want to install the
<xref
href="https://github.com/infotexture/dita-bootstrap.sass"
href="https://github.com/dita-bootstrap/dita-bootstrap.sass"
format="html"
scope="external"
>dita-bootstrap.sass</xref> plug-in.</note>
Expand Down Expand Up @@ -511,13 +507,13 @@
<parmname>--args.hdr</parmname>=<filepath>path/to/your-header.xml</filepath></codeblock>
<p>The plug-in includes a sample
<xref
href="https://github.com/infotexture/dita-bootstrap/blob/develop/includes/hdr.navbar.example.xml"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/blob/develop/includes/hdr.navbar.example.xml"
format="html"
scope="external"
>header alternative with a light navbar</xref>.</p>
<p>No footer is added by default, but the plug-in also includes a sample
<xref
href="https://github.com/infotexture/dita-bootstrap/blob/develop/includes/ftr.content.example.xml"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/blob/develop/includes/ftr.content.example.xml"
format="html"
scope="external"
>footer file</xref> and Bootstrap also offers additional <xref
Expand Down Expand Up @@ -588,10 +584,10 @@

<note type="note">For an example of <option>collapsible</option> styling, see the output at
<xref
href="https://infotexture.github.io/dita-bootstrap/"
href="https://dita-bootstrap.github.io/"
format="html"
scope="external"
>infotexture.github.io/dita-bootstrap</xref>. </note>
>dita-bootstrap.github.io</xref>. </note>
</section>
<section>
<title>Common Bootstrap utility classes</title>
Expand Down
6 changes: 3 additions & 3 deletions sample/nav.dita
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@

<p>The plug-in includes a sample
<xref
href="https://github.com/infotexture/dita-bootstrap/blob/develop/includes/hdr.sidebar.example.xml"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/blob/develop/includes/hdr.sidebar.example.xml"
format="html"
scope="external"
>header</xref>.</p>
Expand All @@ -158,7 +158,7 @@

<p>The plug-in also includes a sample
<xref
href="https://github.com/infotexture/dita-bootstrap/blob/develop/includes/ftr.sidebar.example.xml"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/blob/develop/includes/ftr.sidebar.example.xml"
format="html"
scope="external"
>custom footer</xref>.</p>
Expand Down Expand Up @@ -195,7 +195,7 @@
</fig>
<p>The plug-in also includes a sample
<xref
href="https://github.com/infotexture/dita-bootstrap/blob/develop/includes/hdr.topbar.example.xml"
href="https://github.com/dita-bootstrap/dita-bootstrap.html/blob/develop/includes/hdr.topbar.example.xml"
format="html"
scope="external"
>custom header</xref>.</p>
Expand Down
4 changes: 2 additions & 2 deletions sample/offline.dita
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<fig>
<title>Sample <filepath>plugin.xml</filepath> file</title>
<codeblock outputclass="language-xml">&lt;plugin id="com.example.bootstrap-offline" version="1.0.0"&gt;
&lt;require plugin="net.infotexture.dita-bootstrap" /&gt;
&lt;require plugin="org.dita-bootstrap.html" /&gt;
&lt;feature extension="ant.import" file="process_offline.xml" /&gt;
&lt;feature extension="bootstrap.process.pre" value="bootstrap.offline" /&gt;

Expand All @@ -58,7 +58,7 @@
</fig>
<note type="note">This plug-in will extend the default HTML5 Bootstrap transformation, so the
<xmlelement>require</xmlelement> element explicitly defines
<filepath>net.infotexture.dita-bootstrap</filepath> as a dependency.</note>
<filepath>org.dita-bootstrap.html</filepath> as a dependency.</note>
</li>
<li>
<p>In the <filepath>com.example.bootstrap-offline</filepath> directory, create a subdirectory named
Expand Down
Loading