[Kimchi-devel] [PATCH] [Wok 2/2] fix for issue #114
Suresh Babu Angadi
sureshab at linux.vnet.ibm.com
Thu May 19 06:46:51 UTC 2016
On 05/18/2016 07:47 AM, Aline Manera wrote:
>
>
> On 05/16/2016 06:11 AM, sureshab at linux.vnet.ibm.com wrote:
>> From: Suresh Babu Angadi <sureshab at in.ibm.com>
>>
>> added dita-hepl.xsl, css file for help pages and
>> help page for "Settings" tab.
>>
>> Signed-off-by: Suresh Babu Angadi <sureshab at in.ibm.com>
>> ---
>> ui/pages/help/dita-help.xsl | 44 ++++++++
>> ui/pages/help/en_US/settings.dita | 43 ++++++++
>> ui/pages/help/wok.css | 208
>> ++++++++++++++++++++++++++++++++++++++
>> 3 files changed, 295 insertions(+)
>> create mode 100644 ui/pages/help/dita-help.xsl
>> create mode 100644 ui/pages/help/en_US/settings.dita
>> create mode 100644 ui/pages/help/wok.css
>>
>> diff --git a/ui/pages/help/dita-help.xsl b/ui/pages/help/dita-help.xsl
>> new file mode 100644
>> index 0000000..fa75bf2
>> --- /dev/null
>> +++ b/ui/pages/help/dita-help.xsl
>> @@ -0,0 +1,44 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<!--
>> +Project Wok
>> +Copyright IBM Corp, 2016
>> +
>
> Is it a copy of a Kimchi/Ginger file ? If so, please add an
> appropriated note to inform this code was derived from other project.
Yes. will add.
>
>> +This library is free software; you can redistribute it and/or
>> +modify it under the terms of the GNU Lesser General Public
>> +License as published by the Free Software Foundation; either
>> +version 2.1 of the License, or (at your option) any later version.
>> +
>> +This library is distributed in the hope that it will be useful,
>> +but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> +Lesser General Public License for more details.
>> +
>> +You should have received a copy of the GNU Lesser General Public
>> +License along with this library; if not, write to the Free Software
>> +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> 02110-1301 USA
>> +-->
>> +<xsl:stylesheet version="1.0"
>> + xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
>> + xmlns="http://www.w3.org/1999/xhtml">
>> + <xsl:output method="xml" indent="yes" encoding="UTF-8" />
>> +
>> + <xsl:template match="/">
>> + <html>
>> + <head>
>> + <title><xsl:value-of select="/cshelp/title" /></title>
>> + <meta charset="UTF-8" />
>> + <link rel="shortcut icon"
>> href="../../images/logo.ico" />
>> + <link rel="stylesheet" type="text/css"
>> href="../wok.css" />
>> + </head>
>> + <body>
>> + <xsl:apply-templates select="//cshelp" />
>> + </body>
>> + </html>
>> + </xsl:template>
>> +
>> + <xsl:template match="cshelp">
>> + <h1><xsl:value-of select="title" /></h1>
>> + <p class="shortdesc"><xsl:value-of select="shortdesc" /></p>
>> + <p class="csbody"><xsl:copy-of select="csbody/node()" /></p>
>> + </xsl:template>
>> +</xsl:stylesheet>
>> diff --git a/ui/pages/help/en_US/settings.dita
>> b/ui/pages/help/en_US/settings.dita
>> new file mode 100644
>> index 0000000..e5b8465
>> --- /dev/null
>> +++ b/ui/pages/help/en_US/settings.dita
>> @@ -0,0 +1,43 @@
>> +<?xml version="1.0" encoding="UTF-8"?>
>> +<!--
>> +Project Wok
>> +Copyright IBM Corp, 2016
>> +
>> +This library is free software; you can redistribute it and/or
>> +modify it under the terms of the GNU Lesser General Public
>> +License as published by the Free Software Foundation; either
>> +version 2.1 of the License, or (at your option) any later version.
>> +
>> +This library is distributed in the hope that it will be useful,
>> +but WITHOUT ANY WARRANTY; without even the implied warranty of
>> +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
>> +Lesser General Public License for more details.
>> +
>> +You should have received a copy of the GNU Lesser General Public
>> +License along with this library; if not, write to the Free Software
>> +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
>> 02110-1301 USA
>> +-->
>> +<!--Arbortext, Inc., 1988-2011, v.4002-->
>> +<!DOCTYPE cshelp PUBLIC "-//IBM//DTD DITA CSHelp//EN"
>> + "..\dtd\cshelp.dtd">
>> +<?Pub Sty _display FontColor="red"?>
>> +<?Pub Inc?>
>> +<!--This DITA specialized document type is not supported by the
>> Authoring Tools development team.
>> +Press the F1 key for online help on the tags and see the DITA XML
>> Guide and Reference for how to use this document type.
>> +For support please see:
>> +https://w3.opensource.ibm.com/projects/dita-cshelp/-->
>> +<cshelp id="settings" xml:lang="en-us">
>> +<title>Settings</title>
>> +<csbody>
>> +<dl><dlentry>
>> +<dt>User Activity Log</dt>
>> +<dd>This section is used to display activity log of all users.</dd>
>
> This section displays user log activity on Wok and its plugins.
I would use - This section displays user activity log on Wok and its
plugins.
>
>> +<dd>Supported operations on User activity log:</dd>
>> +<dd>Advanced Search: Use this option to search logs of particular
>> application(such as wok, ginger, gingerbase) or user, or with request
>> type, or within particular time range.</dd>
>
> I'd replace the above 2 lines to something like:
>
> "To get any specific log result, please use the 'Advanced Search'
> option. You can specify a particular application (such as wok, ginger,
> gingerbase, kimchi), an user, request type or even date range."
ok
>
>
>> +<dd>Select "Reset to Default" option to clear the search criteria.</dd>
>> +<dd>Download: Use this option to download user activity log.</dd>
>
> There is an extra space between 'activity' and 'log'
thanks, will remove it.
>
>> +</dlentry>
>> +</dl><?Pub Caret 2101?>
>> +</csbody>
>> +</cshelp>
>> +<?Pub *0000003732?>
>> diff --git a/ui/pages/help/wok.css b/ui/pages/help/wok.css
>> new file mode 100644
>> index 0000000..e98eae8
>> --- /dev/null
>> +++ b/ui/pages/help/wok.css
>> @@ -0,0 +1,208 @@
>> +/*
>> + * Project Wok
>> + *
>> + * Copyright IBM Corp, 2016
>> + *
>
> Is it a copy of a Kimchi/Ginger file ? If so, please add an
> appropriated note to inform this code was derived from other project.
okay
>
>> + * Licensed under the Apache License, Version 2.0 (the "License");
>> + * you may not use this file except in compliance with the License.
>> + * You may obtain a copy of the License at
>> + *
>> + * http://www.apache.org/licenses/LICENSE-2.0
>> + *
>> + * Unless required by applicable law or agreed to in writing, software
>> + * distributed under the License is distributed on an "AS IS" BASIS,
>> + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
>> implied.
>> + * See the License for the specific language governing permissions and
>> + * limitations under the License.
>> + */
>> +BODY {
>> + background: #FFFFFF;
>> + margin-bottom: 1em;
>> + margin-left: .5em;
>> +}
>> +
>> +bold {
>> + font-weight: bold;
>> +}
>> +
>> +boldItalic {
>> + font-weight: bold;
>> + font-style: italic;
>> +}
>> +
>> +italic {
>> + font-style: italic;
>> +}
>> +
>> +underlined {
>> + text-decoration: underline;
>> +}
>> +
>> +uicontrol {
>> + font-weight: bold;
>> +}
>> +
>> +filepath {
>> + font-family: monospace, monospace;
>> +}.option {
>> + font-family: monospace, monospace;
>> +}
>> +
>> +cmdname {
>> + font-weight: bold;
>> + font-family: monospace, monospace;
>> +}
>> +
>> +.defparmname {
>> + font-weight: bold;
>> + text-decoration: underline;
>> + font-family: monospace, monospace;
>> +}
>> +
>> +.kwd {
>> + font-weight: bold;
>> +}
>> +
>> +.defkwd {
>> + font-weight: bold;
>> + text-decoration: underline;
>> +}
>> +
>> +var {
>> + font-style : italic;
>> +}
>> +
>> +strongwintitle {
>> + font-weight : bold;
>> +}
>> +
>> +parmname {
>> + font-weight: bold;
>> + font-family: monospace, monospace;
>> + white-space: nowrap;
>> +}
>> +
>> +code {
>> + font-family: monospace, monospace;
>> +}
>> +
>> +pre {
>> + font-family: monospace, monospace;
>> +}
>> +
>> +CITE {
>> + font-style: italic;
>> +}
>> +
>> +EM {
>> + font-style: italic;
>> +}
>> +
>> +STRONG {
>> + font-weight: bold;
>> +}
>> +
>> +VAR {
>> + font-style: italic;
>> +}
>> +
>> +dt {
>> + font-weight: bold;
>> +}
>> +
>> +/***********************************************************
>> + * Basic fonts
>> + ***********************************************************/
>> +body,
>> +td,
>> +th,
>> +caption {
>> + font-family: Verdana, Arial, Helvetica, sans-serif;
>> + font-size: 10pt;
>> +}
>> +
>> +pre, code {
>> + font-family: MS Courier New, Courier, monospace;
>> +}
>> +
>> +h1, h2, h3 {
>> + font-size: 12pt;
>> + font-weight: bold;
>> + color: #336699;
>> +}
>> +
>> +h4 {
>> + font-size: 10pt;
>> + font-weight: bold;
>> + color: #336699;
>> +}
>> +
>> +/***********************************************************
>> + * Basic indents, padding, and margin
>> + ***********************************************************/
>> +body {
>> + color: black;
>> + background-color: white;
>> + margin: 0;
>> + padding-top: 0.2em;
>> + padding-left: 0.6em;
>> + padding-right: 0.2em;
>> + padding-bottom: 1em;
>> +}
>> +
>> +h1,
>> +h2,
>> +h3,
>> +h4,
>> +h5,
>> +h6 {
>> + padding: 0;
>> + margin-top: 1em;
>> + margin-bottom: 0.75em;
>> + margin-left: 0;
>> + margin-right: 0;
>> +}
>> +
>> +address,
>> +dl,
>> +li,
>> +p {
>> + padding: 0;
>> + margin-top: 0.75em;
>> + margin-bottom: 0.75em;
>> + margin-left: 0;
>> + margin-right: 0;
>> + line-height: 125%;
>> +}
>> +
>> +td dl {
>> + margin-left: 2em;
>> +}
>> +
>> +pre {
>> + padding: 0;
>> + margin-top: 0.75em;
>> + margin-bottom: 0.75em;
>> + margin-left: 2em;
>> + margin-right: 0;
>> +}
>> +
>> +ol,
>> +ul {
>> + padding: 0;
>> + margin-top: 0.75em;
>> + margin-bottom: 0.75em;
>> + margin-left: 2.00em;
>> + margin-right: 0;
>> +}
>> +
>> +dd {
>> + margin-left: 3.00em;
>> + margin-top: 0.75em;
>> + margin-bottom: 0.75em;
>> +}
>> +
>> +dt {
>> + margin-left: 1.00em;
>> + margin-top: 0.75em;
>> +}
>
--
Regards,
Suresh Babu Angadi
More information about the Kimchi-devel
mailing list