[PATCH 0/3 V4] Update README and header for Wok files
From: Paulo Vital <pvital@linux.vnet.ibm.com> V3 -> V4: - Fixed gettext dependency V1 -> V2 -> V3: - Grammar fixes V1: Update the README file of Wok and Kimchi projects after the split of code and changed the header of all back-end and front-end files of Wok. Paulo Vital (3): Update README.md of Wok and Kimchi after slipt. Update the header of all Wok back-end files Update the header of all Wok front-end files Makefile.am | 6 +- autogen.sh | 20 +++++ configure.ac | 4 +- contrib/DEBIAN/Makefile.am | 7 +- contrib/DEBIAN/postrm | 6 +- contrib/Makefile.am | 7 +- contrib/check_i18n.py | 4 +- docs/Makefile.am | 6 +- docs/README.md | 93 ++++++++++++++++++++++ src/Makefile.am | 4 +- src/nginx/Makefile.am | 4 +- src/nginx/wok.conf.in | 4 +- src/wok/Makefile.am | 6 +- src/wok/__init__.py | 6 +- src/wok/asynctask.py | 6 +- src/wok/auth.py | 4 +- src/wok/basemodel.py | 6 +- src/wok/cachebust.py | 6 +- src/wok/config.py.in | 4 +- src/wok/control/Makefile.am | 6 +- src/wok/control/__init__.py | 6 +- src/wok/control/base.py | 4 +- src/wok/control/plugins.py | 6 +- src/wok/control/tasks.py | 6 +- src/wok/control/utils.py | 6 +- src/wok/exception.py | 6 +- src/wok/i18n.py | 4 +- src/wok/model/Makefile.am | 6 +- src/wok/model/__init__.py | 6 +- src/wok/model/model.py | 4 +- src/wok/model/plugins.py | 6 +- src/wok/model/tasks.py | 6 +- src/wok/objectstore.py | 6 +- src/wok/plugins/Makefile.am | 6 +- src/wok/plugins/__init__.py | 6 +- src/wok/plugins/kimchi/docs/README.md | 86 ++++++++------------ src/wok/plugins/sample/Makefile.am | 6 +- src/wok/plugins/sample/__init__.py | 6 +- src/wok/plugins/sample/i18n.py | 4 +- src/wok/plugins/sample/model.py | 6 +- src/wok/plugins/sample/ui/Makefile.am | 8 +- src/wok/plugins/sample/ui/config/Makefile.am | 7 +- src/wok/plugins/sample/ui/js/Makefile.am | 6 +- src/wok/plugins/sample/ui/js/util.js | 6 +- src/wok/plugins/sample/ui/pages/Makefile.am | 6 +- src/wok/plugins/sample/ui/pages/i18n.json.tmpl | 6 +- .../plugins/sample/ui/pages/sample-tab1.html.tmpl | 6 +- .../plugins/sample/ui/pages/sample-tab2.html.tmpl | 6 +- src/wok/proxy.py | 4 +- src/wok/rollbackcontext.py | 6 +- src/wok/root.py | 4 +- src/wok/server.py | 6 +- src/wok/sslcert.py | 6 +- src/wok/template.py | 6 +- src/wok/utils.py | 4 +- src/wok/xmlutils/Makefile.am | 6 +- src/wok/xmlutils/__init__.py | 6 +- src/wok/xmlutils/utils.py | 6 +- src/wokd.in | 4 +- ui/Makefile.am | 6 +- ui/base64/Makefile.am | 4 +- ui/css/Makefile.am | 6 +- ui/css/fontawesome/Makefile.am | 4 +- ui/css/jquery-ui.custom.css | 4 +- ui/css/opensans/Makefile.am | 4 +- ui/css/theme-default/about.css | 6 +- ui/css/theme-default/base.css | 6 +- ui/css/theme-default/button-flat.css | 4 +- ui/css/theme-default/button.css | 4 +- ui/css/theme-default/checkbox-flat.css | 6 +- ui/css/theme-default/circleGauge.css | 6 +- ui/css/theme-default/datagrid.css | 4 +- ui/css/theme-default/dialog-flat.css | 6 +- ui/css/theme-default/error.css | 6 +- ui/css/theme-default/form.css | 4 +- ui/css/theme-default/framework.css | 6 +- ui/css/theme-default/gauge-flat.css | 6 +- ui/css/theme-default/grid.css | 6 +- ui/css/theme-default/jquery-ui.custom.css | 6 +- ui/css/theme-default/line-chart.css | 6 +- ui/css/theme-default/line.css | 4 +- ui/css/theme-default/list-flat.css | 6 +- ui/css/theme-default/login-window.css | 6 +- ui/css/theme-default/menu-flat.css | 4 +- ui/css/theme-default/message-flat.css | 6 +- ui/css/theme-default/message.css | 4 +- ui/css/theme-default/messagebar-flat.css | 6 +- ui/css/theme-default/nav-tree.css | 6 +- ui/css/theme-default/navbar.css | 6 +- ui/css/theme-default/popover.css | 6 +- ui/css/theme-default/radio-flat.css | 8 +- ui/css/theme-default/reset.css | 4 +- ui/css/theme-default/selectmenu-flat.css | 4 +- ui/css/theme-default/tabs.css | 4 +- ui/css/theme-default/textbox-flat.css | 6 +- ui/css/theme-default/theme.css | 4 +- ui/css/theme-default/tile-check.css | 6 +- ui/css/theme-default/toolbar.css | 6 +- ui/css/theme-default/topbar.css | 4 +- ui/css/theme-default/window.css | 4 +- ui/images/Makefile.am | 6 +- ui/images/theme-default/Makefile.am | 6 +- ui/js/Makefile.am | 6 +- ui/js/src/wok.api.js | 4 +- ui/js/src/wok.cookie.js | 6 +- ui/js/src/wok.form.js | 6 +- ui/js/src/wok.grid.js | 4 +- ui/js/src/wok.lang.js | 6 +- ui/js/src/wok.line-chart.js | 6 +- ui/js/src/wok.login.js | 4 +- ui/js/src/wok.main.js | 4 +- ui/js/src/wok.message.js | 6 +- ui/js/src/wok.object.js | 6 +- ui/js/src/wok.popable.js | 6 +- ui/js/src/wok.select.js | 6 +- ui/js/src/wok.string.js | 6 +- ui/js/src/wok.substitute.js | 6 +- ui/js/src/wok.topic.js | 6 +- ui/js/src/wok.user.js | 6 +- ui/js/src/wok.utils.js | 4 +- ui/js/src/wok.window.js | 6 +- ui/js/widgets/button-dropDown.js | 6 +- ui/js/widgets/button-flat.js | 4 +- ui/js/widgets/checkbox-flat.js | 4 +- ui/js/widgets/circleGauge.js | 6 +- ui/js/widgets/combobox.js | 6 +- ui/js/widgets/dialog-flat.js | 4 +- ui/js/widgets/filter-select.js | 6 +- ui/js/widgets/gauge-flat.js | 4 +- ui/js/widgets/grid.js | 4 +- ui/js/widgets/line.js | 4 +- ui/js/widgets/list-flat.js | 4 +- ui/js/widgets/menu-flat.js | 4 +- ui/js/widgets/message-flat.js | 4 +- ui/js/widgets/messagebar-flat.js | 4 +- ui/js/widgets/radio-flat.js | 4 +- ui/js/widgets/samples/dialog.html | 4 +- ui/js/widgets/samples/gauge-flat.html | 6 +- ui/js/widgets/samples/grid.html | 4 +- ui/js/widgets/samples/line.html | 4 +- ui/js/widgets/samples/list.html | 4 +- .../menu-button-radio-checkbox-text-select.html | 4 +- ui/js/widgets/samples/message.html | 4 +- ui/js/widgets/samples/messagebar-flat.html | 4 +- ui/js/widgets/samples/tabs.html | 4 +- ui/js/widgets/select-menu.js | 6 +- ui/js/widgets/selectmenu-flat.js | 4 +- ui/js/widgets/textbox-flat.js | 4 +- ui/libs/Makefile.am | 6 +- ui/libs/bootstrap-select/Makefile.am | 4 +- ui/libs/bootstrap/Makefile.am | 4 +- ui/libs/es5-shim/Makefile.am | 4 +- ui/libs/jquery-i18n/Makefile.am | 4 +- ui/libs/jquery-ui/Makefile.am | 4 +- ui/libs/jquery-ui/themes/Makefile.am | 6 +- ui/libs/jquery-ui/themes/base/Makefile.am | 6 +- ui/libs/jquery-ui/themes/base/images/Makefile.am | 6 +- ui/libs/jquery/Makefile.am | 4 +- ui/pages/Makefile.am | 6 +- ui/pages/error.html.tmpl | 6 +- ui/pages/i18n.json.tmpl | 4 +- ui/pages/login.html.tmpl | 6 +- ui/pages/websockify/Makefile.am | 6 +- ui/pages/wok-ui.html.tmpl | 6 +- 164 files changed, 731 insertions(+), 311 deletions(-) -- 2.4.3
From: Paulo Vital <pvital@linux.vnet.ibm.com> Update the Readme file of Wok and Kimchi to describe the dependencies and supports necessary to each project. Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- docs/README.md | 93 +++++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/docs/README.md | 86 +++++++++++++------------------- 2 files changed, 127 insertions(+), 52 deletions(-) diff --git a/docs/README.md b/docs/README.md index b128510..f0b8697 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,6 +10,99 @@ Examples of such plugins are Kimchi (Virtualization Management) and Ginger Wok runs through wokd daemon. +Browser Support +=============== + +Wok and its plugins can run in any web browser that supports HTML5. The +Kimchi community (responsible for Wok project) makes an effort to +test it with the latest versions of Chrome and Firefox browsers, but the +following list can be used as reference to browser support. + +Desktop Browser Support: +----------------------- +* **Internet Explorer:** Current version +* **Chrome:** Current version +* **Firefox:** Current version +* **Safari:** Current version +* **Opera:** Current version + +Mobile Browser Support: +----------------------- +* **Safari iOS:** Current version +* **Android Browser** Current version + + +Hypervisor Distro Support +========================= + +Wok might run on any GNU/Linux distribution that meets the conditions +described on the 'Getting Started' section below. + +The Kimchi community (responsible for Wok project) makes an effort to +test it with the latest versions of Fedora, RHEL, OpenSUSE, and Ubuntu. + +Getting Started +=============== + +Install Dependencies +-------------------- + +**For Fedora and RHEL:** + + $ sudo yum install gcc make autoconf automake gettext git \ + python-cherrypy python-cheetah python-imaging\ + PyPAM m2crypto python-jsonschema rpm-build \ + python-psutil python-ldap python-lxml \ + libxslt nginx openssl + + + # If using RHEL, install the following additional packages: + $ sudo yum install python-unittest2 python-ordereddict + + Packages version requirement: + python-psutil >= 0.6.0 + + # These dependencies are only required if you want to run the tests: + $ sudo yum install pyflakes python-pep8 python-requests + +*Note for RHEL users*: Some of the above packages are located in the Red Hat +EPEL repositories. See +[this FAQ](http://fedoraproject.org/wiki/EPEL#How_can_I_use_these_extra_packages.3F) +for more information on how to configure your system to access this repository. + +And for RHEL7 systems, you also need to subscribe to the "RHEL Server Optional" +channel at RHN Classic or Red Hat Satellite. + +**For Ubuntu (Debian-based):** + + $ sudo apt-get install gcc make autoconf automake gettext git \ + python-cherrypy3 python-cheetah python-imaging \ + python-pam python-m2crypto python-jsonschema \ + python-psutil python-ldap python-lxml nginx \ + libxslt openssl + + Packages version requirement: + python-jsonschema >= 1.3.0 + python-psutil >= 0.6.0 + + # These dependencies are only required if you want to run the tests: + $ sudo apt-get install pep8 pyflakes python-requests + +**For openSUSE:** + + $ sudo zypper install gcc make autoconf automake gettext-tools git \ + python-CherryPy python-Cheetah python-pam \ + python-imaging python-M2Crypto python-jsonschema \ + rpm-build python-psutil python-ldap python-lxml \ + libxslt-tools python-xml nginx openssl + + Packages version requirement: + python-psutil >= 0.6.0 + + # These dependencies are only required if you want to run the tests: + $ sudo zypper install python-pyflakes python-pep8 python-requests + + Build and Install ----------------- diff --git a/src/wok/plugins/kimchi/docs/README.md b/src/wok/plugins/kimchi/docs/README.md index eeb64d9..fb0aef9 100644 --- a/src/wok/plugins/kimchi/docs/README.md +++ b/src/wok/plugins/kimchi/docs/README.md @@ -11,30 +11,30 @@ over the web using a browser that supports HTML5. Browser Support =============== + +Wok and its plugin can run in any web browser that supports HTML5. The +Kimchi community (responsible for Wok project) makes an effort to +test it with the latest versions of Chrome and Firefox browsers, but the +following list can be used as reference to browser support. + Desktop Browser Support: ----------------------- -* **Internet Explorer:** IE9+ -* **Chrome:** Current-1 version -* **Firefox:** Current-1 version Firefox 24ESR -* **Safari:** Current-1 version -* **Opera:** Current-1 version +* **Internet Explorer:** Current version +* **Chrome:** Current version +* **Firefox:** Current version +* **Safari:** Current version +* **Opera:** Current version Mobile Browser Support: ----------------------- -* **Safari iOS:** Current-1 version -* **Android Browser** Current-1 version +* **Safari iOS:** Current version +* **Android Browser** Current version -Current-1 version denotes that we support the current stable version of the -browser and the version that preceded it. For example, if the current version of -a browser is 24.x, we support the 24.x and 23.x versions.This does not mean that -kimchi cannot be used in other browsers, however, functionality and appearance -may be diminished and we may not be able to provide support for any problems you -find. Hypervisor Distro Support ========================= -Kimchi and Wok might run on any GNU/Linux distribution that meets the conditions +Kimchi might run on any GNU/Linux distribution that meets the conditions described on the 'Getting Started' section below. The Kimchi community makes an effort to test it with the latest versions of @@ -48,15 +48,13 @@ Install Dependencies **For fedora and RHEL:** - $ sudo yum install gcc make autoconf automake gettext-devel git \ - python-cherrypy python-cheetah libvirt-python \ - libvirt libvirt-daemon-config-network python-imaging \ - PyPAM m2crypto python-jsonschema rpm-build \ - qemu-kvm python-psutil python-ethtool sos \ - python-ipaddr python-ldap python-lxml nfs-utils \ - iscsi-initiator-utils libxslt pyparted nginx \ - python-libguestfs libguestfs-tools python-websockify \ - novnc spice-html5 python-configobj python-magic + $ sudo yum install wok libvirt-python libvirt \ + libvirt-daemon-config-network python-imaging \ + qemu-kvm python-ethtool sos python-ipaddr \ + nfs-utils iscsi-initiator-utils pyparted \ + python-libguestfs libguestfs-tools \ + python-websockify novnc spice-html5 \ + python-configobj python-magic # If using RHEL, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict @@ -64,9 +62,6 @@ Install Dependencies # Restart libvirt to allow configuration changes to take effect $ sudo service libvirtd restart - Packages version requirement: - python-psutil >= 0.6.0 - # These dependencies are only required if you want to run the tests: $ sudo yum install pyflakes python-pep8 python-requests @@ -78,39 +73,26 @@ for more information on how to configure your system to access this repository. And for RHEL7 systems, you also need to subscribe to the "RHEL Server Optional" channel at RHN Classic or Red Hat Satellite. -**For debian:** - - $ sudo apt-get install gcc make autoconf automake gettext git \ - python-cherrypy3 python-cheetah python-libvirt \ - libvirt-bin python-imaging python-configobj \ - python-pam python-m2crypto python-jsonschema \ - qemu-kvm libtool python-psutil python-ethtool \ - sosreport python-ipaddr python-ldap \ - python-lxml nfs-common open-iscsi lvm2 xsltproc \ - python-parted nginx python-guestfs libguestfs-tools \ - websockify novnc spice-html5 python-magic +**For Ubuntu (Debian-based):** - Packages version requirement: - python-jsonschema >= 1.3.0 - python-psutil >= 0.6.0 + $ sudo apt-get install wok python-imaging python-configobj websockify \ + novnc python-libvirt libvirt-bin nfs-common \ + qemu-kvm python-parted python-ethtool sosreport \ + python-ipaddr python-lxml open-iscsi \ + python-guestfs libguestfs-tools spice-html5 \ + python-magic \ # These dependencies are only required if you want to run the tests: $ sudo apt-get install pep8 pyflakes python-requests **For openSUSE:** - $ sudo zypper install gcc make autoconf automake gettext-tools git \ - python-CherryPy python-Cheetah libvirt-python \ - libvirt libvirt-daemon-config-network python-pam \ - python-imaging python-M2Crypto python-jsonschema \ - rpm-build kvm python-psutil python-ethtool \ - python-ipaddr python-ldap python-lxml nfs-client \ - open-iscsi libxslt-tools python-xml python-parted \ - nginx python-libguestfs python-configobj \ - guestfs-tools python-websockify novnc python-magic - - Packages version requirement: - python-psutil >= 0.6.0 + $ sudo zypper install wok libvirt-python libvirt \ + libvirt-daemon-config-network python-imaging \ + kvm python-ethtool python-ipaddr nfs-client \ + open-iscsi python-parted python-libguestfs \ + python-configobj guestfs-tools python-websockify \ + novnc python-magic # These dependencies are only required if you want to run the tests: $ sudo zypper install python-pyflakes python-pep8 python-requests -- 2.4.3
From: Paulo Vital <pvital@linux.vnet.ibm.com> Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- Makefile.am | 6 ++++-- autogen.sh | 20 ++++++++++++++++++++ configure.ac | 4 +++- contrib/DEBIAN/Makefile.am | 7 ++++++- contrib/DEBIAN/postrm | 6 ++++-- contrib/Makefile.am | 7 ++++++- contrib/check_i18n.py | 4 +++- docs/Makefile.am | 6 ++++-- src/Makefile.am | 4 +++- src/nginx/Makefile.am | 4 +++- src/nginx/wok.conf.in | 4 +++- src/wok/Makefile.am | 6 ++++-- src/wok/__init__.py | 6 ++++-- src/wok/asynctask.py | 6 ++++-- src/wok/auth.py | 4 +++- src/wok/basemodel.py | 6 ++++-- src/wok/cachebust.py | 6 ++++-- src/wok/config.py.in | 4 +++- src/wok/control/Makefile.am | 6 ++++-- src/wok/control/__init__.py | 6 ++++-- src/wok/control/base.py | 4 +++- src/wok/control/plugins.py | 6 ++++-- src/wok/control/tasks.py | 6 ++++-- src/wok/control/utils.py | 6 ++++-- src/wok/exception.py | 6 ++++-- src/wok/i18n.py | 4 +++- src/wok/model/Makefile.am | 6 ++++-- src/wok/model/__init__.py | 6 ++++-- src/wok/model/model.py | 4 +++- src/wok/model/plugins.py | 6 ++++-- src/wok/model/tasks.py | 6 ++++-- src/wok/objectstore.py | 6 ++++-- src/wok/plugins/Makefile.am | 6 ++++-- src/wok/plugins/__init__.py | 6 ++++-- src/wok/plugins/sample/Makefile.am | 6 ++++-- src/wok/plugins/sample/__init__.py | 6 ++++-- src/wok/plugins/sample/i18n.py | 4 +++- src/wok/plugins/sample/model.py | 6 ++++-- src/wok/plugins/sample/ui/Makefile.am | 8 ++++---- src/wok/plugins/sample/ui/config/Makefile.am | 7 ++++--- src/wok/plugins/sample/ui/js/Makefile.am | 6 ++++-- src/wok/plugins/sample/ui/js/util.js | 6 ++++-- src/wok/plugins/sample/ui/pages/Makefile.am | 6 ++++-- src/wok/plugins/sample/ui/pages/i18n.json.tmpl | 6 ++++-- .../plugins/sample/ui/pages/sample-tab1.html.tmpl | 6 ++++-- .../plugins/sample/ui/pages/sample-tab2.html.tmpl | 6 ++++-- src/wok/proxy.py | 4 +++- src/wok/rollbackcontext.py | 6 ++++-- src/wok/root.py | 4 +++- src/wok/server.py | 6 ++++-- src/wok/sslcert.py | 6 ++++-- src/wok/template.py | 6 ++++-- src/wok/utils.py | 4 +++- src/wok/xmlutils/Makefile.am | 6 ++++-- src/wok/xmlutils/__init__.py | 6 ++++-- src/wok/xmlutils/utils.py | 6 ++++-- src/wokd.in | 4 +++- 57 files changed, 233 insertions(+), 98 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0eabd3d..348e5b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/autogen.sh b/autogen.sh index 0f22dba..68c67f8 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,24 @@ #!/bin/bash +# +# Project Wok +# +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi +# +# 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 aclocal automake --add-missing diff --git a/configure.ac b/configure.ac index 98ce5ee..67c3920 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM Corp, 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/contrib/DEBIAN/Makefile.am b/contrib/DEBIAN/Makefile.am index ca89552..ba4af4f 100644 --- a/contrib/DEBIAN/Makefile.am +++ b/contrib/DEBIAN/Makefile.am @@ -1,4 +1,9 @@ -# Copyright IBM Corp, 2013 +# +# Project Wok +# +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/DEBIAN/postrm b/contrib/DEBIAN/postrm index 256a234..c22b5fb 100755 --- a/contrib/DEBIAN/postrm +++ b/contrib/DEBIAN/postrm @@ -1,8 +1,10 @@ #!/bin/sh -e # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/Makefile.am b/contrib/Makefile.am index b537df5..ed4a006 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -1,4 +1,9 @@ -# Copyright IBM Corp, 2013 +# +# Project Wok +# +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/contrib/check_i18n.py b/contrib/check_i18n.py index 6a2603c..49e9f8e 100755 --- a/contrib/check_i18n.py +++ b/contrib/check_i18n.py @@ -1,9 +1,11 @@ #!/usr/bin/env python2 # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2014-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/docs/Makefile.am b/docs/Makefile.am index db23721..738d42b 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/Makefile.am b/src/Makefile.am index 2fed7d5..f06d755 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM Corp, 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/nginx/Makefile.am b/src/nginx/Makefile.am index 0f36b44..a376a74 100644 --- a/src/nginx/Makefile.am +++ b/src/nginx/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM Corp, 2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index ce99115..db68893 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -1,7 +1,9 @@ -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2014-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/Makefile.am b/src/wok/Makefile.am index 47aefd5..ed92130 100644 --- a/src/wok/Makefile.am +++ b/src/wok/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/__init__.py b/src/wok/__init__.py index edf8e5d..8da776e 100644 --- a/src/wok/__init__.py +++ b/src/wok/__init__.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py index e3e10d5..7020980 100644 --- a/src/wok/asynctask.py +++ b/src/wok/asynctask.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/auth.py b/src/wok/auth.py index 6ae8bfc..afd4cf4 100644 --- a/src/wok/auth.py +++ b/src/wok/auth.py @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/basemodel.py b/src/wok/basemodel.py index 096c66b..032c760 100644 --- a/src/wok/basemodel.py +++ b/src/wok/basemodel.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/cachebust.py b/src/wok/cachebust.py index 26cb232..66d7152 100644 --- a/src/wok/cachebust.py +++ b/src/wok/cachebust.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 3540aea..ef59a98 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/control/Makefile.am b/src/wok/control/Makefile.am index d6cb3f0..2be54c1 100644 --- a/src/wok/control/Makefile.am +++ b/src/wok/control/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/__init__.py b/src/wok/control/__init__.py index 4ad9459..37cc02e 100644 --- a/src/wok/control/__init__.py +++ b/src/wok/control/__init__.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/base.py b/src/wok/control/base.py index f2ad552..5c5c95f 100644 --- a/src/wok/control/base.py +++ b/src/wok/control/base.py @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/control/plugins.py b/src/wok/control/plugins.py index 1cc1d5a..7758271 100644 --- a/src/wok/control/plugins.py +++ b/src/wok/control/plugins.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/tasks.py b/src/wok/control/tasks.py index f6e8a80..e689661 100644 --- a/src/wok/control/tasks.py +++ b/src/wok/control/tasks.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/control/utils.py b/src/wok/control/utils.py index 56f9e7f..a9d7bc3 100644 --- a/src/wok/control/utils.py +++ b/src/wok/control/utils.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/exception.py b/src/wok/exception.py index 6f5e9d9..bac326c 100644 --- a/src/wok/exception.py +++ b/src/wok/exception.py @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/i18n.py b/src/wok/i18n.py index a6376bd..ad3ea9f 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2014-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/model/Makefile.am b/src/wok/model/Makefile.am index 8f0f102..82b7a7b 100644 --- a/src/wok/model/Makefile.am +++ b/src/wok/model/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/model/__init__.py b/src/wok/model/__init__.py index ca7ede4..3d5632a 100644 --- a/src/wok/model/__init__.py +++ b/src/wok/model/__init__.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/model/model.py b/src/wok/model/model.py index 09c4c1e..e8826f2 100644 --- a/src/wok/model/model.py +++ b/src/wok/model/model.py @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2014-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py index e350f1e..3a5a89e 100644 --- a/src/wok/model/plugins.py +++ b/src/wok/model/plugins.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/model/tasks.py b/src/wok/model/tasks.py index d57c908..a3618db 100644 --- a/src/wok/model/tasks.py +++ b/src/wok/model/tasks.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/objectstore.py b/src/wok/objectstore.py index aa2a21c..670a363 100644 --- a/src/wok/objectstore.py +++ b/src/wok/objectstore.py @@ -1,6 +1,8 @@ -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/Makefile.am b/src/wok/plugins/Makefile.am index 21a6ece..9f65fda 100644 --- a/src/wok/plugins/Makefile.am +++ b/src/wok/plugins/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/__init__.py b/src/wok/plugins/__init__.py index 0539a76..005a244 100644 --- a/src/wok/plugins/__init__.py +++ b/src/wok/plugins/__init__.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/sample/Makefile.am b/src/wok/plugins/sample/Makefile.am index 876ab54..49983b8 100644 --- a/src/wok/plugins/sample/Makefile.am +++ b/src/wok/plugins/sample/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/sample/__init__.py b/src/wok/plugins/sample/__init__.py index a3a8f05..43a0758 100644 --- a/src/wok/plugins/sample/__init__.py +++ b/src/wok/plugins/sample/__init__.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/sample/i18n.py b/src/wok/plugins/sample/i18n.py index 763970f..f5d7b92 100644 --- a/src/wok/plugins/sample/i18n.py +++ b/src/wok/plugins/sample/i18n.py @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2014 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/plugins/sample/model.py b/src/wok/plugins/sample/model.py index 4ada648..0856c20 100644 --- a/src/wok/plugins/sample/model.py +++ b/src/wok/plugins/sample/model.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/sample/ui/Makefile.am b/src/wok/plugins/sample/ui/Makefile.am index 37fec98..c785ba6 100644 --- a/src/wok/plugins/sample/ui/Makefile.am +++ b/src/wok/plugins/sample/ui/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,5 +20,3 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA SUBDIRS = config js pages - - diff --git a/src/wok/plugins/sample/ui/config/Makefile.am b/src/wok/plugins/sample/ui/config/Makefile.am index cf9e09e..4054045 100644 --- a/src/wok/plugins/sample/ui/config/Makefile.am +++ b/src/wok/plugins/sample/ui/config/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2013 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -18,4 +20,3 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA EXTRA_DIST = tab-ext.xml - diff --git a/src/wok/plugins/sample/ui/js/Makefile.am b/src/wok/plugins/sample/ui/js/Makefile.am index 4d536ae..96d1f4a 100644 --- a/src/wok/plugins/sample/ui/js/Makefile.am +++ b/src/wok/plugins/sample/ui/js/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2014 +# Copyright IBM Corp, 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/sample/ui/js/util.js b/src/wok/plugins/sample/ui/js/util.js index 7689a81..55909d1 100644 --- a/src/wok/plugins/sample/ui/js/util.js +++ b/src/wok/plugins/sample/ui/js/util.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/wok/plugins/sample/ui/pages/Makefile.am b/src/wok/plugins/sample/ui/pages/Makefile.am index 3da95a2..e4df623 100644 --- a/src/wok/plugins/sample/ui/pages/Makefile.am +++ b/src/wok/plugins/sample/ui/pages/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2014 +# Copyright IBM Corp, 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/plugins/sample/ui/pages/i18n.json.tmpl b/src/wok/plugins/sample/ui/pages/i18n.json.tmpl index 737bb39..3146025 100644 --- a/src/wok/plugins/sample/ui/pages/i18n.json.tmpl +++ b/src/wok/plugins/sample/ui/pages/i18n.json.tmpl @@ -1,7 +1,9 @@ #* - * Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl index 4354d81..19b2c07 100644 --- a/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl +++ b/src/wok/plugins/sample/ui/pages/sample-tab1.html.tmpl @@ -1,7 +1,9 @@ #* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl index 4354d81..19b2c07 100644 --- a/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl +++ b/src/wok/plugins/sample/ui/pages/sample-tab2.html.tmpl @@ -1,7 +1,9 @@ #* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/wok/proxy.py b/src/wok/proxy.py index 961f8a7..46ce857 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -1,9 +1,11 @@ #!/usr/bin/python # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2014-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/rollbackcontext.py b/src/wok/rollbackcontext.py index 2f3e8bc..14cd937 100644 --- a/src/wok/rollbackcontext.py +++ b/src/wok/rollbackcontext.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/root.py b/src/wok/root.py index 4262bd0..1776915 100644 --- a/src/wok/root.py +++ b/src/wok/root.py @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/server.py b/src/wok/server.py index e18ecb5..c6f12dd 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/sslcert.py b/src/wok/sslcert.py index 6b64796..47072e9 100644 --- a/src/wok/sslcert.py +++ b/src/wok/sslcert.py @@ -1,9 +1,11 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 # Copyright (C) 2004-2005 OSAF. All Rights Reserved. # +# Code derived from Project Kimchi +# # Portions of this file were derived from the python-m2crypto unit tests: # http://svn.osafoundation.org/m2crypto/trunk/tests/test_x509.py # diff --git a/src/wok/template.py b/src/wok/template.py index c743f73..ed3873e 100644 --- a/src/wok/template.py +++ b/src/wok/template.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013-2014 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/utils.py b/src/wok/utils.py index 89ab15d..9f96e57 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -1,8 +1,10 @@ # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/src/wok/xmlutils/Makefile.am b/src/wok/xmlutils/Makefile.am index 69aa524..1ae0f2b 100644 --- a/src/wok/xmlutils/Makefile.am +++ b/src/wok/xmlutils/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM Corp, 2014 +# Copyright IBM Corp, 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/xmlutils/__init__.py b/src/wok/xmlutils/__init__.py index ca7ede4..3d5632a 100644 --- a/src/wok/xmlutils/__init__.py +++ b/src/wok/xmlutils/__init__.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wok/xmlutils/utils.py b/src/wok/xmlutils/utils.py index be08a14..b75ca51 100644 --- a/src/wok/xmlutils/utils.py +++ b/src/wok/xmlutils/utils.py @@ -1,7 +1,9 @@ # -# Project Kimchi +# Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 +# +# Code derived from Project Kimchi # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --git a/src/wokd.in b/src/wokd.in index f225361..c5510fd 100644 --- a/src/wokd.in +++ b/src/wokd.in @@ -1,9 +1,11 @@ #!/usr/bin/env python2 # -# Project Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 -- 2.4.3
From: Paulo Vital <pvital@linux.vnet.ibm.com> Signed-off-by: Paulo Vital <pvital@linux.vnet.ibm.com> --- ui/Makefile.am | 6 ++++-- ui/base64/Makefile.am | 4 +++- ui/css/Makefile.am | 6 ++++-- ui/css/fontawesome/Makefile.am | 4 +++- ui/css/jquery-ui.custom.css | 4 +++- ui/css/opensans/Makefile.am | 4 +++- ui/css/theme-default/about.css | 6 ++++-- ui/css/theme-default/base.css | 6 ++++-- ui/css/theme-default/button-flat.css | 4 +++- ui/css/theme-default/button.css | 4 +++- ui/css/theme-default/checkbox-flat.css | 6 ++++-- ui/css/theme-default/circleGauge.css | 6 ++++-- ui/css/theme-default/datagrid.css | 4 +++- ui/css/theme-default/dialog-flat.css | 6 ++++-- ui/css/theme-default/error.css | 6 ++++-- ui/css/theme-default/form.css | 4 +++- ui/css/theme-default/framework.css | 6 ++++-- ui/css/theme-default/gauge-flat.css | 6 ++++-- ui/css/theme-default/grid.css | 6 ++++-- ui/css/theme-default/jquery-ui.custom.css | 6 ++++-- ui/css/theme-default/line-chart.css | 6 ++++-- ui/css/theme-default/line.css | 4 +++- ui/css/theme-default/list-flat.css | 6 ++++-- ui/css/theme-default/login-window.css | 6 ++++-- ui/css/theme-default/menu-flat.css | 4 +++- ui/css/theme-default/message-flat.css | 6 ++++-- ui/css/theme-default/message.css | 4 +++- ui/css/theme-default/messagebar-flat.css | 6 ++++-- ui/css/theme-default/nav-tree.css | 6 ++++-- ui/css/theme-default/navbar.css | 6 ++++-- ui/css/theme-default/popover.css | 6 ++++-- ui/css/theme-default/radio-flat.css | 8 +++++--- ui/css/theme-default/reset.css | 4 +++- ui/css/theme-default/selectmenu-flat.css | 4 +++- ui/css/theme-default/tabs.css | 4 +++- ui/css/theme-default/textbox-flat.css | 6 ++++-- ui/css/theme-default/theme.css | 4 +++- ui/css/theme-default/tile-check.css | 6 ++++-- ui/css/theme-default/toolbar.css | 6 ++++-- ui/css/theme-default/topbar.css | 4 +++- ui/css/theme-default/window.css | 4 +++- ui/images/Makefile.am | 6 ++++-- ui/images/theme-default/Makefile.am | 6 ++++-- ui/js/Makefile.am | 6 ++++-- ui/js/src/wok.api.js | 4 +++- ui/js/src/wok.cookie.js | 6 ++++-- ui/js/src/wok.form.js | 6 ++++-- ui/js/src/wok.grid.js | 4 +++- ui/js/src/wok.lang.js | 6 ++++-- ui/js/src/wok.line-chart.js | 6 ++++-- ui/js/src/wok.login.js | 4 +++- ui/js/src/wok.main.js | 4 +++- ui/js/src/wok.message.js | 6 ++++-- ui/js/src/wok.object.js | 6 ++++-- ui/js/src/wok.popable.js | 6 ++++-- ui/js/src/wok.select.js | 6 ++++-- ui/js/src/wok.string.js | 6 ++++-- ui/js/src/wok.substitute.js | 6 ++++-- ui/js/src/wok.topic.js | 6 ++++-- ui/js/src/wok.user.js | 6 ++++-- ui/js/src/wok.utils.js | 4 +++- ui/js/src/wok.window.js | 6 ++++-- ui/js/widgets/button-dropDown.js | 6 ++++-- ui/js/widgets/button-flat.js | 4 +++- ui/js/widgets/checkbox-flat.js | 4 +++- ui/js/widgets/circleGauge.js | 6 ++++-- ui/js/widgets/combobox.js | 6 ++++-- ui/js/widgets/dialog-flat.js | 4 +++- ui/js/widgets/filter-select.js | 6 ++++-- ui/js/widgets/gauge-flat.js | 4 +++- ui/js/widgets/grid.js | 4 +++- ui/js/widgets/line.js | 4 +++- ui/js/widgets/list-flat.js | 4 +++- ui/js/widgets/menu-flat.js | 4 +++- ui/js/widgets/message-flat.js | 4 +++- ui/js/widgets/messagebar-flat.js | 4 +++- ui/js/widgets/radio-flat.js | 4 +++- ui/js/widgets/samples/dialog.html | 4 +++- ui/js/widgets/samples/gauge-flat.html | 6 ++++-- ui/js/widgets/samples/grid.html | 4 +++- ui/js/widgets/samples/line.html | 4 +++- ui/js/widgets/samples/list.html | 4 +++- ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html | 4 +++- ui/js/widgets/samples/message.html | 4 +++- ui/js/widgets/samples/messagebar-flat.html | 4 +++- ui/js/widgets/samples/tabs.html | 4 +++- ui/js/widgets/select-menu.js | 6 ++++-- ui/js/widgets/selectmenu-flat.js | 4 +++- ui/js/widgets/textbox-flat.js | 4 +++- ui/libs/Makefile.am | 6 ++++-- ui/libs/bootstrap-select/Makefile.am | 4 +++- ui/libs/bootstrap/Makefile.am | 4 +++- ui/libs/es5-shim/Makefile.am | 4 +++- ui/libs/jquery-i18n/Makefile.am | 4 +++- ui/libs/jquery-ui/Makefile.am | 4 +++- ui/libs/jquery-ui/themes/Makefile.am | 6 ++++-- ui/libs/jquery-ui/themes/base/Makefile.am | 6 ++++-- ui/libs/jquery-ui/themes/base/images/Makefile.am | 6 ++++-- ui/libs/jquery/Makefile.am | 4 +++- ui/pages/Makefile.am | 6 ++++-- ui/pages/error.html.tmpl | 6 ++++-- ui/pages/i18n.json.tmpl | 4 +++- ui/pages/login.html.tmpl | 6 ++++-- ui/pages/websockify/Makefile.am | 6 ++++-- ui/pages/wok-ui.html.tmpl | 6 ++++-- 105 files changed, 371 insertions(+), 161 deletions(-) diff --git a/ui/Makefile.am b/ui/Makefile.am index 0abb3ff..5170546 100644 --- a/ui/Makefile.am +++ b/ui/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/base64/Makefile.am b/ui/base64/Makefile.am index 56417d9..ca2efca 100644 --- a/ui/base64/Makefile.am +++ b/ui/base64/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index 6f8fe05..c61120e 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/css/fontawesome/Makefile.am b/ui/css/fontawesome/Makefile.am index 872b6c9..d52e6b5 100644 --- a/ui/css/fontawesome/Makefile.am +++ b/ui/css/fontawesome/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/css/jquery-ui.custom.css b/ui/css/jquery-ui.custom.css index 48b44ab..ba3d95a 100644 --- a/ui/css/jquery-ui.custom.css +++ b/ui/css/jquery-ui.custom.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/opensans/Makefile.am b/ui/css/opensans/Makefile.am index 49aadb6..2bf5980 100644 --- a/ui/css/opensans/Makefile.am +++ b/ui/css/opensans/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/css/theme-default/about.css b/ui/css/theme-default/about.css index 577b403..a4c287c 100644 --- a/ui/css/theme-default/about.css +++ b/ui/css/theme-default/about.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/base.css b/ui/css/theme-default/base.css index 1104f55..ea7dca4 100644 --- a/ui/css/theme-default/base.css +++ b/ui/css/theme-default/base.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 @@ -69,4 +71,4 @@ html, body { .help-inline { display: inline-block; -} \ No newline at end of file +} diff --git a/ui/css/theme-default/button-flat.css b/ui/css/theme-default/button-flat.css index 0897b10..d666bf2 100755 --- a/ui/css/theme-default/button-flat.css +++ b/ui/css/theme-default/button-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index 071e331..44aaf7a 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/checkbox-flat.css b/ui/css/theme-default/checkbox-flat.css index b8712b3..82f6a89 100644 --- a/ui/css/theme-default/checkbox-flat.css +++ b/ui/css/theme-default/checkbox-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 @@ -22,4 +24,4 @@ .checkbox-inline { display: inline-block; - } \ No newline at end of file + } diff --git a/ui/css/theme-default/circleGauge.css b/ui/css/theme-default/circleGauge.css index 48ef1d3..3c3c296 100644 --- a/ui/css/theme-default/circleGauge.css +++ b/ui/css/theme-default/circleGauge.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/datagrid.css b/ui/css/theme-default/datagrid.css index 14d28c3..1b33030 100644 --- a/ui/css/theme-default/datagrid.css +++ b/ui/css/theme-default/datagrid.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/dialog-flat.css b/ui/css/theme-default/dialog-flat.css index fafe5b0..62f1a74 100644 --- a/ui/css/theme-default/dialog-flat.css +++ b/ui/css/theme-default/dialog-flat.css @@ -1,8 +1,10 @@ /* -* Project Kimchi +* Project Wok * * Copyright IBM, Corp. 2015 * +* Code derived from Project Kimchi +* * 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 @@ -64,4 +66,4 @@ .dialog-container .dialog-footer .dialog-button:hover{ background-color: #EEEEEE; cursor: pointer; -} \ No newline at end of file +} diff --git a/ui/css/theme-default/error.css b/ui/css/theme-default/error.css index bb6f814..46f2960 100644 --- a/ui/css/theme-default/error.css +++ b/ui/css/theme-default/error.css @@ -1,7 +1,9 @@ /* - * Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/form.css b/ui/css/theme-default/form.css index 9f3c6b6..23fd1ca 100644 --- a/ui/css/theme-default/form.css +++ b/ui/css/theme-default/form.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/framework.css b/ui/css/theme-default/framework.css index ad3e37e..e1e2200 100644 --- a/ui/css/theme-default/framework.css +++ b/ui/css/theme-default/framework.css @@ -1,9 +1,11 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * - * Licensed under the Apache License, Version 2.0 (the "License"); + * Code derived from Project Kimchi + * +* 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 * diff --git a/ui/css/theme-default/gauge-flat.css b/ui/css/theme-default/gauge-flat.css index 2aa09da..881b7ac 100755 --- a/ui/css/theme-default/gauge-flat.css +++ b/ui/css/theme-default/gauge-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 @@ -49,4 +51,4 @@ .ui-gauge-flat .purple { background: #7F1C7D; border:1px solid #7F1C7D; -} \ No newline at end of file +} diff --git a/ui/css/theme-default/grid.css b/ui/css/theme-default/grid.css index dfc20ff..711c7f8 100644 --- a/ui/css/theme-default/grid.css +++ b/ui/css/theme-default/grid.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/jquery-ui.custom.css b/ui/css/theme-default/jquery-ui.custom.css index 56f7e06..61879f8 100644 --- a/ui/css/theme-default/jquery-ui.custom.css +++ b/ui/css/theme-default/jquery-ui.custom.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/line-chart.css b/ui/css/theme-default/line-chart.css index 15d9bb8..393204d 100644 --- a/ui/css/theme-default/line-chart.css +++ b/ui/css/theme-default/line-chart.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/line.css b/ui/css/theme-default/line.css index 7dde827..c90340e 100644 --- a/ui/css/theme-default/line.css +++ b/ui/css/theme-default/line.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/list-flat.css b/ui/css/theme-default/list-flat.css index ba0439d..9156e03 100644 --- a/ui/css/theme-default/list-flat.css +++ b/ui/css/theme-default/list-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 @@ -80,4 +82,4 @@ .list-item-detail { font-size: 11px; color: #CDCDCD; -} \ No newline at end of file +} diff --git a/ui/css/theme-default/login-window.css b/ui/css/theme-default/login-window.css index d403079..037f1ac 100644 --- a/ui/css/theme-default/login-window.css +++ b/ui/css/theme-default/login-window.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/menu-flat.css b/ui/css/theme-default/menu-flat.css index 385a312..186356e 100644 --- a/ui/css/theme-default/menu-flat.css +++ b/ui/css/theme-default/menu-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/message-flat.css b/ui/css/theme-default/message-flat.css index 8281bff..4c4b580 100644 --- a/ui/css/theme-default/message-flat.css +++ b/ui/css/theme-default/message-flat.css @@ -1,8 +1,10 @@ /* -* Project Kimchi +* Project Wok * * Copyright IBM, Corp. 2015 * +* Code derived from Project Kimchi +* * 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 @@ -84,4 +86,4 @@ .message-dialog .message-footer .message-button:hover{ background-color: #EEEEEE; cursor: pointer; -} \ No newline at end of file +} diff --git a/ui/css/theme-default/message.css b/ui/css/theme-default/message.css index e77886b..5775334 100644 --- a/ui/css/theme-default/message.css +++ b/ui/css/theme-default/message.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/messagebar-flat.css b/ui/css/theme-default/messagebar-flat.css index d5efc8e..d63920a 100644 --- a/ui/css/theme-default/messagebar-flat.css +++ b/ui/css/theme-default/messagebar-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 @@ -61,4 +63,4 @@ .dark-red { background-color: #D81227; -} \ No newline at end of file +} diff --git a/ui/css/theme-default/nav-tree.css b/ui/css/theme-default/nav-tree.css index d33e717..689a24d 100644 --- a/ui/css/theme-default/nav-tree.css +++ b/ui/css/theme-default/nav-tree.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/navbar.css b/ui/css/theme-default/navbar.css index 24ef451..91692f1 100644 --- a/ui/css/theme-default/navbar.css +++ b/ui/css/theme-default/navbar.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css index 3668307..43e9a0e 100644 --- a/ui/css/theme-default/popover.css +++ b/ui/css/theme-default/popover.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/radio-flat.css b/ui/css/theme-default/radio-flat.css index 0c03485..85681e9 100644 --- a/ui/css/theme-default/radio-flat.css +++ b/ui/css/theme-default/radio-flat.css @@ -1,9 +1,11 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * - * Licensed under the Apache License, Version 2.0 (the 'License'); + * Code derived from Project Kimchi + * +* 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 * @@ -27,4 +29,4 @@ .inline-radio { display: inline-block; - } \ No newline at end of file + } diff --git a/ui/css/theme-default/reset.css b/ui/css/theme-default/reset.css index 6d27a4e..2b5aa44 100644 --- a/ui/css/theme-default/reset.css +++ b/ui/css/theme-default/reset.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/selectmenu-flat.css b/ui/css/theme-default/selectmenu-flat.css index 0f91d80..933f5fd 100644 --- a/ui/css/theme-default/selectmenu-flat.css +++ b/ui/css/theme-default/selectmenu-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/tabs.css b/ui/css/theme-default/tabs.css index 47404b7..6a36307 100644 --- a/ui/css/theme-default/tabs.css +++ b/ui/css/theme-default/tabs.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/textbox-flat.css b/ui/css/theme-default/textbox-flat.css index 39d5ffb..7a0313a 100644 --- a/ui/css/theme-default/textbox-flat.css +++ b/ui/css/theme-default/textbox-flat.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 @@ -19,4 +21,4 @@ .textbox-container { border: 1px solid #CCC; border-radius: 3px; - } \ No newline at end of file + } diff --git a/ui/css/theme-default/theme.css b/ui/css/theme-default/theme.css index 221f488..21d9c3b 100644 --- a/ui/css/theme-default/theme.css +++ b/ui/css/theme-default/theme.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/tile-check.css b/ui/css/theme-default/tile-check.css index 5e802ca..e9a11e5 100644 --- a/ui/css/theme-default/tile-check.css +++ b/ui/css/theme-default/tile-check.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/toolbar.css b/ui/css/theme-default/toolbar.css index ea2a039..1d37f4d 100644 --- a/ui/css/theme-default/toolbar.css +++ b/ui/css/theme-default/toolbar.css @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index 4fce02c..d68cf98 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index 5cb2790..fa836dd 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/images/Makefile.am b/ui/images/Makefile.am index 0c8700e..ef15cea 100644 --- a/ui/images/Makefile.am +++ b/ui/images/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/images/theme-default/Makefile.am b/ui/images/theme-default/Makefile.am index 336729c..85fdf5f 100644 --- a/ui/images/theme-default/Makefile.am +++ b/ui/images/theme-default/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index 2549846..feaacb5 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.api.js b/ui/js/src/wok.api.js index 93a07ad..bc73cdd 100644 --- a/ui/js/src/wok.api.js +++ b/ui/js/src/wok.api.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/src/wok.cookie.js b/ui/js/src/wok.cookie.js index bc0a06d..41c3912 100644 --- a/ui/js/src/wok.cookie.js +++ b/ui/js/src/wok.cookie.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.form.js b/ui/js/src/wok.form.js index 0bb7c4b..49f9752 100644 --- a/ui/js/src/wok.form.js +++ b/ui/js/src/wok.form.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.grid.js b/ui/js/src/wok.grid.js index 84f8d33..12f191c 100644 --- a/ui/js/src/wok.grid.js +++ b/ui/js/src/wok.grid.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/src/wok.lang.js b/ui/js/src/wok.lang.js index ef8e923..783cbfa 100644 --- a/ui/js/src/wok.lang.js +++ b/ui/js/src/wok.lang.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.line-chart.js b/ui/js/src/wok.line-chart.js index 8b40288..3c740e6 100644 --- a/ui/js/src/wok.line-chart.js +++ b/ui/js/src/wok.line-chart.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index 926d80c..d9ccae6 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2014-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/src/wok.main.js b/ui/js/src/wok.main.js index fe07f4a..25fed31 100644 --- a/ui/js/src/wok.main.js +++ b/ui/js/src/wok.main.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js index db1dc36..bd650e0 100644 --- a/ui/js/src/wok.message.js +++ b/ui/js/src/wok.message.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.object.js b/ui/js/src/wok.object.js index 57ec8d7..35484e8 100644 --- a/ui/js/src/wok.object.js +++ b/ui/js/src/wok.object.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.popable.js b/ui/js/src/wok.popable.js index 7c01a0e..289e60f 100644 --- a/ui/js/src/wok.popable.js +++ b/ui/js/src/wok.popable.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.select.js b/ui/js/src/wok.select.js index 60830a5..43cb57f 100644 --- a/ui/js/src/wok.select.js +++ b/ui/js/src/wok.select.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.string.js b/ui/js/src/wok.string.js index 252ae50..ea9e2ee 100644 --- a/ui/js/src/wok.string.js +++ b/ui/js/src/wok.string.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.substitute.js b/ui/js/src/wok.substitute.js index 225f967..30329a8 100644 --- a/ui/js/src/wok.substitute.js +++ b/ui/js/src/wok.substitute.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.topic.js b/ui/js/src/wok.topic.js index 0b8b148..febbe0a 100644 --- a/ui/js/src/wok.topic.js +++ b/ui/js/src/wok.topic.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.user.js b/ui/js/src/wok.user.js index e642801..822ff78 100644 --- a/ui/js/src/wok.user.js +++ b/ui/js/src/wok.user.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/src/wok.utils.js b/ui/js/src/wok.utils.js index edb23ad..07fab1f 100644 --- a/ui/js/src/wok.utils.js +++ b/ui/js/src/wok.utils.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/src/wok.window.js b/ui/js/src/wok.window.js index 5542270..ef00a77 100644 --- a/ui/js/src/wok.window.js +++ b/ui/js/src/wok.window.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/button-dropDown.js b/ui/js/widgets/button-dropDown.js index ec6bd2a..a4f20e9 100644 --- a/ui/js/widgets/button-dropDown.js +++ b/ui/js/widgets/button-dropDown.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/button-flat.js b/ui/js/widgets/button-flat.js index bc72544..12d1dc9 100755 --- a/ui/js/widgets/button-flat.js +++ b/ui/js/widgets/button-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/checkbox-flat.js b/ui/js/widgets/checkbox-flat.js index 8a2564f..cd22205 100644 --- a/ui/js/widgets/checkbox-flat.js +++ b/ui/js/widgets/checkbox-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/circleGauge.js b/ui/js/widgets/circleGauge.js index 52ec027..b093143 100644 --- a/ui/js/widgets/circleGauge.js +++ b/ui/js/widgets/circleGauge.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/combobox.js b/ui/js/widgets/combobox.js index 92244a2..c2bb75b 100644 --- a/ui/js/widgets/combobox.js +++ b/ui/js/widgets/combobox.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/dialog-flat.js b/ui/js/widgets/dialog-flat.js index 22fc1f0..b70af22 100644 --- a/ui/js/widgets/dialog-flat.js +++ b/ui/js/widgets/dialog-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/filter-select.js b/ui/js/widgets/filter-select.js index db6b4b0..8e78fc1 100644 --- a/ui/js/widgets/filter-select.js +++ b/ui/js/widgets/filter-select.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/gauge-flat.js b/ui/js/widgets/gauge-flat.js index f715bb6..aeb0fd5 100755 --- a/ui/js/widgets/gauge-flat.js +++ b/ui/js/widgets/gauge-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/grid.js b/ui/js/widgets/grid.js index bc6a11d..1f47495 100644 --- a/ui/js/widgets/grid.js +++ b/ui/js/widgets/grid.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/line.js b/ui/js/widgets/line.js index 8fcc4ba..8dd10b2 100644 --- a/ui/js/widgets/line.js +++ b/ui/js/widgets/line.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/list-flat.js b/ui/js/widgets/list-flat.js index 8e9ea84..12ea43d 100644 --- a/ui/js/widgets/list-flat.js +++ b/ui/js/widgets/list-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/menu-flat.js b/ui/js/widgets/menu-flat.js index 8263393..0da3593 100644 --- a/ui/js/widgets/menu-flat.js +++ b/ui/js/widgets/menu-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/message-flat.js b/ui/js/widgets/message-flat.js index d59d452..4393332 100644 --- a/ui/js/widgets/message-flat.js +++ b/ui/js/widgets/message-flat.js @@ -1,8 +1,10 @@ /* -* Project Kimchi +* Project Wok * * Copyright IBM, Corp. 2015 * +* Code derived from Project Kimchi +* * 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 diff --git a/ui/js/widgets/messagebar-flat.js b/ui/js/widgets/messagebar-flat.js index b7bd86f..a050ad6 100644 --- a/ui/js/widgets/messagebar-flat.js +++ b/ui/js/widgets/messagebar-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/radio-flat.js b/ui/js/widgets/radio-flat.js index 401ef62..3cb8836 100644 --- a/ui/js/widgets/radio-flat.js +++ b/ui/js/widgets/radio-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/dialog.html b/ui/js/widgets/samples/dialog.html index 40594d0..ec67b97 100644 --- a/ui/js/widgets/samples/dialog.html +++ b/ui/js/widgets/samples/dialog.html @@ -1,9 +1,11 @@ <!-- /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/gauge-flat.html b/ui/js/widgets/samples/gauge-flat.html index 92ce07a..efa6eec 100644 --- a/ui/js/widgets/samples/gauge-flat.html +++ b/ui/js/widgets/samples/gauge-flat.html @@ -1,10 +1,12 @@ <!--Sample code of gauge--> <!-- /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 @@ -50,4 +52,4 @@ }); </script> </body> -</html> \ No newline at end of file +</html> diff --git a/ui/js/widgets/samples/grid.html b/ui/js/widgets/samples/grid.html index 9b92d62..860874f 100644 --- a/ui/js/widgets/samples/grid.html +++ b/ui/js/widgets/samples/grid.html @@ -1,9 +1,11 @@ <!-- * - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/line.html b/ui/js/widgets/samples/line.html index cc0b738..4ded4db 100644 --- a/ui/js/widgets/samples/line.html +++ b/ui/js/widgets/samples/line.html @@ -1,9 +1,11 @@ <!-- * - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/list.html b/ui/js/widgets/samples/list.html index 850550c..39388b3 100644 --- a/ui/js/widgets/samples/list.html +++ b/ui/js/widgets/samples/list.html @@ -1,9 +1,11 @@ <!-- * - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html b/ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html index e435263..48ac2b1 100644 --- a/ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html +++ b/ui/js/widgets/samples/menu-button-radio-checkbox-text-select.html @@ -1,9 +1,11 @@ <!-- * - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/message.html b/ui/js/widgets/samples/message.html index b8a2cf4..0fd5c45 100644 --- a/ui/js/widgets/samples/message.html +++ b/ui/js/widgets/samples/message.html @@ -1,9 +1,11 @@ <!-- * - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/messagebar-flat.html b/ui/js/widgets/samples/messagebar-flat.html index fd1417a..4014283 100644 --- a/ui/js/widgets/samples/messagebar-flat.html +++ b/ui/js/widgets/samples/messagebar-flat.html @@ -1,9 +1,11 @@ <!-- /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/samples/tabs.html b/ui/js/widgets/samples/tabs.html index a8c4b4d..0a5c401 100644 --- a/ui/js/widgets/samples/tabs.html +++ b/ui/js/widgets/samples/tabs.html @@ -1,9 +1,11 @@ <!-- * - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/select-menu.js b/ui/js/widgets/select-menu.js index bd7a207..d176d00 100644 --- a/ui/js/widgets/select-menu.js +++ b/ui/js/widgets/select-menu.js @@ -1,7 +1,9 @@ /* - * Project Kimchi + * Project Wok * - * Copyright IBM, Corp. 2014 + * Copyright IBM, Corp. 2014-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the 'License'); * you may not use this file except in compliance with the License. diff --git a/ui/js/widgets/selectmenu-flat.js b/ui/js/widgets/selectmenu-flat.js index de17dcd..3cd34ef 100644 --- a/ui/js/widgets/selectmenu-flat.js +++ b/ui/js/widgets/selectmenu-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/js/widgets/textbox-flat.js b/ui/js/widgets/textbox-flat.js index cd9eca0..40f6233 100644 --- a/ui/js/widgets/textbox-flat.js +++ b/ui/js/widgets/textbox-flat.js @@ -1,8 +1,10 @@ /* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am index 38af60b..d746df4 100644 --- a/ui/libs/Makefile.am +++ b/ui/libs/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/bootstrap-select/Makefile.am b/ui/libs/bootstrap-select/Makefile.am index df7964e..f655f1b 100644 --- a/ui/libs/bootstrap-select/Makefile.am +++ b/ui/libs/bootstrap-select/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/libs/bootstrap/Makefile.am b/ui/libs/bootstrap/Makefile.am index da746a1..fe35d79 100644 --- a/ui/libs/bootstrap/Makefile.am +++ b/ui/libs/bootstrap/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wol # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/libs/es5-shim/Makefile.am b/ui/libs/es5-shim/Makefile.am index 0d40e3d..5bbe691 100644 --- a/ui/libs/es5-shim/Makefile.am +++ b/ui/libs/es5-shim/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/libs/jquery-i18n/Makefile.am b/ui/libs/jquery-i18n/Makefile.am index 56872b0..f33a9fc 100644 --- a/ui/libs/jquery-i18n/Makefile.am +++ b/ui/libs/jquery-i18n/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/libs/jquery-ui/Makefile.am b/ui/libs/jquery-ui/Makefile.am index 9d9f646..5c86d6e 100644 --- a/ui/libs/jquery-ui/Makefile.am +++ b/ui/libs/jquery-ui/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/libs/jquery-ui/themes/Makefile.am b/ui/libs/jquery-ui/themes/Makefile.am index 1ce56d9..b8e9653 100644 --- a/ui/libs/jquery-ui/themes/Makefile.am +++ b/ui/libs/jquery-ui/themes/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/jquery-ui/themes/base/Makefile.am b/ui/libs/jquery-ui/themes/base/Makefile.am index 8a5bbd2..67547e2 100644 --- a/ui/libs/jquery-ui/themes/base/Makefile.am +++ b/ui/libs/jquery-ui/themes/base/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/jquery-ui/themes/base/images/Makefile.am b/ui/libs/jquery-ui/themes/base/images/Makefile.am index 38e6f18..437f8af 100644 --- a/ui/libs/jquery-ui/themes/base/images/Makefile.am +++ b/ui/libs/jquery-ui/themes/base/images/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/libs/jquery/Makefile.am b/ui/libs/jquery/Makefile.am index 1aef505..14cc1d3 100644 --- a/ui/libs/jquery/Makefile.am +++ b/ui/libs/jquery/Makefile.am @@ -1,8 +1,10 @@ # -# Kimchi +# Project Wok # # Copyright IBM, Corp. 2013-2015 # +# Code derived from Project Kimchi +# # 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 diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am index 68f4c92..2488203 100644 --- a/ui/pages/Makefile.am +++ b/ui/pages/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2013 +# Copyright IBM, Corp. 2013-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/pages/error.html.tmpl b/ui/pages/error.html.tmpl index c767ffb..298dbe2 100644 --- a/ui/pages/error.html.tmpl +++ b/ui/pages/error.html.tmpl @@ -1,7 +1,9 @@ #* - * Kimchi + * Project Wok * - * Copyright IBM, Corp. 2013-2014 + * Copyright IBM, Corp. 2013-2015 + * + * Code derived from Project Kimchi * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index cd320e0..8753a6e 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -1,8 +1,10 @@ #* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2014-2015 * + * Code derived from Project Kimchi + * * 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 diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 1b87b60..2703d02 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -1,8 +1,10 @@ #* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2014-2015 * + * Code derived from Project Kimchi + * * 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 @@ -79,7 +81,7 @@ </head> <body onload="wok.login_main()"> <div class="container topbar"> - <span id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></span> + <span id="logo"><img alt="Project Wok" src="images/theme-default/logo-white.png"></span> <select id="userLang"> <option value="en_US">English (US)</option> <option value="zh_CN">中文（简体）</option> diff --git a/ui/pages/websockify/Makefile.am b/ui/pages/websockify/Makefile.am index 5321562..ca3ddc3 100644 --- a/ui/pages/websockify/Makefile.am +++ b/ui/pages/websockify/Makefile.am @@ -1,7 +1,9 @@ # -# Kimchi +# Project Wok # -# Copyright IBM, Corp. 2014 +# Copyright IBM, Corp. 2014-2015 +# +# Code derived from Project Kimchi # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index 3eb8c54..669ae29 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -1,8 +1,10 @@ #* - * Project Kimchi + * Project Wok * * Copyright IBM, Corp. 2013-2015 * + * Code derived from Project Kimchi + * * 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 @@ -86,7 +88,7 @@ <body onload="wok.main()"> <div class="container"> <header class="topbar"> - <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1> + <h1 id="logo"><img alt="Project Wok" src="images/theme-default/logo-white.png"></h1> <ul class="nav-top"> <li> <div id="peers" class="peers hide-content popable"> -- 2.4.3
Reviewed by: Lucio Correia <luciojhc@linux.vnet.ibm.com> On 10/02/2015 08:28 AM, pvital@linux.vnet.ibm.com wrote:
From: Paulo Vital <pvital@linux.vnet.ibm.com>
V3 -> V4: - Fixed gettext dependency
V1 -> V2 -> V3: - Grammar fixes
V1: Update the README file of Wok and Kimchi projects after the split of code and changed the header of all back-end and front-end files of Wok.
Paulo Vital (3): Update README.md of Wok and Kimchi after slipt. Update the header of all Wok back-end files Update the header of all Wok front-end files
-- Lucio Correia Software Engineer IBM LTC Brazil
participants (3)
-
Aline Manera -
Lucio Correia -
pvital＠linux.vnet.ibm.com