[Kimchi-devel] [PATCH V3 19/34] Do not use tabs dir for kimchi plugin html templates

This patch standardizes kimchi plugin tmpl files location to be similar of other plugins. It only moves tmpl files from plugins/kimchi/ui/pages/tabs to plugins/kimchi/ui/pages and updates respective Makefiles. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com&gt; Signed-off-by: Gustavo Y. Ribeiro <gyr(a)linux.vnet.ibm.com&gt; --- plugins/kimchi/ui/pages/Makefile.am | 2 +- .../kimchi/ui/pages/{tabs => }/guests.html.tmpl | 0 plugins/kimchi/ui/pages/{tabs => }/host.html.tmpl | 0 .../kimchi/ui/pages/{tabs => }/network.html.tmpl | 0 .../kimchi/ui/pages/{tabs => }/storage.html.tmpl | 0 plugins/kimchi/ui/pages/tabs/Makefile.am | 20 -------------------- .../kimchi/ui/pages/{tabs => }/templates.html.tmpl | 0 7 files changed, 1 insertions(+), 21 deletions(-) rename plugins/kimchi/ui/pages/{tabs => }/guests.html.tmpl (100%) rename plugins/kimchi/ui/pages/{tabs => }/host.html.tmpl (100%) rename plugins/kimchi/ui/pages/{tabs => }/network.html.tmpl (100%) rename plugins/kimchi/ui/pages/{tabs => }/storage.html.tmpl (100%) delete mode 100644 plugins/kimchi/ui/pages/tabs/Makefile.am rename plugins/kimchi/ui/pages/{tabs => }/templates.html.tmpl (100%) diff --git a/plugins/kimchi/ui/pages/Makefile.am b/plugins/kimchi/ui/pages/Makefile.am index 076b814..56288e3 100644 --- a/plugins/kimchi/ui/pages/Makefile.am +++ b/plugins/kimchi/ui/pages/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = help tabs +SUBDIRS = help htmldir = $(datadir)/wok/plugins/kimchi/ui/pages diff --git a/plugins/kimchi/ui/pages/tabs/guests.html.tmpl b/plugins/kimchi/ui/pages/guests.html.tmpl similarity index 100% rename from plugins/kimchi/ui/pages/tabs/guests.html.tmpl rename to plugins/kimchi/ui/pages/guests.html.tmpl diff --git a/plugins/kimchi/ui/pages/tabs/host.html.tmpl b/plugins/kimchi/ui/pages/host.html.tmpl similarity index 100% rename from plugins/kimchi/ui/pages/tabs/host.html.tmpl rename to plugins/kimchi/ui/pages/host.html.tmpl diff --git a/plugins/kimchi/ui/pages/tabs/network.html.tmpl b/plugins/kimchi/ui/pages/network.html.tmpl similarity index 100% rename from plugins/kimchi/ui/pages/tabs/network.html.tmpl rename to plugins/kimchi/ui/pages/network.html.tmpl diff --git a/plugins/kimchi/ui/pages/tabs/storage.html.tmpl b/plugins/kimchi/ui/pages/storage.html.tmpl similarity index 100% rename from plugins/kimchi/ui/pages/tabs/storage.html.tmpl rename to plugins/kimchi/ui/pages/storage.html.tmpl diff --git a/plugins/kimchi/ui/pages/tabs/Makefile.am b/plugins/kimchi/ui/pages/tabs/Makefile.am deleted file mode 100644 index 4d5d33e..0000000 --- a/plugins/kimchi/ui/pages/tabs/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -# -# Kimchi -# -# Copyright IBM, Corp. 2013 -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -tabshtmldir = $(datadir)/wok/plugins/kimchi/ui/pages/tabs - -dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL) diff --git a/plugins/kimchi/ui/pages/tabs/templates.html.tmpl b/plugins/kimchi/ui/pages/templates.html.tmpl similarity index 100% rename from plugins/kimchi/ui/pages/tabs/templates.html.tmpl rename to plugins/kimchi/ui/pages/templates.html.tmpl -- 1.7.1