From 3e47ba3e259ea952fe555a3f89d71179da10ce85 Mon Sep 17 00:00:00 2001 From: Philippe Caseiro Date: Wed, 5 Nov 2014 11:23:39 +0100 Subject: [PATCH] =?UTF-8?q?tmpl/sunstone-appmarket.conf:=20Cr=C3=A9ation?= =?UTF-8?q?=20du=20fichier?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tmpl/admin.yaml : Ajout de la configuration pour les vues appmarket tmpl/user.yaml : Ajout de la configuration pour les vues appmarket tmpl/sunstone-server.conf: Ajout de la route appmarket tmpl/sunstone-views.yaml: ajout des vues appmarket ref #9377 @30m --- tmpl/admin.yaml | 35 +++++++++++++++++++++++++++++++++++ tmpl/sunstone-appmarket.conf | 29 +++++++++++++++++++++++++++++ tmpl/sunstone-server.conf | 3 +++ tmpl/sunstone-views.yaml | 4 ++++ tmpl/user.yaml | 35 +++++++++++++++++++++++++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 tmpl/sunstone-appmarket.conf diff --git a/tmpl/admin.yaml b/tmpl/admin.yaml index 003c2fe..29fd494 100644 --- a/tmpl/admin.yaml +++ b/tmpl/admin.yaml @@ -25,6 +25,10 @@ enabled_tabs: oneflow-dashboard: false oneflow-services: false oneflow-templates: false +%end if +%if %%getVar('activer_market_views', 'non') == 'oui' + apptools-appmarket-dashboard: true + apptools-appmarket-appliances: true %end if support-tab: true doc-tab: true @@ -466,3 +470,34 @@ tabs: Zone.refresh: true Zone.create_dialog: true Zone.delete: true +%if %%getVar('activer_market_views', 'non') == 'oui' + apptools-appmarket-dashboard: + panel_tabs: + table_columns: + actions: + apptools-appmarket-appliances: + panel_tabs: + appmarketplace_info_tab: true + appmarketplace_jobs_tab: true + appmarketplace_template_tab: true + panel_tabs_actions: + appmarketplace_jobs_tab: + Job.del: true + table_columns: + - 0 # Checkbox + #- 1 # ID + - 2 # Name + - 3 # Status + - 4 # Publisher + - 5 # Hypervisor + - 6 # Arch + - 7 # Format + #- 8 # Tags + - 9 # Created + actions: + AppMarket.refresh: true + AppMarket.import: true + AppMarket.delete: true + AppMarket.convert: true + AppMarket.create_dialog: true +%end if diff --git a/tmpl/sunstone-appmarket.conf b/tmpl/sunstone-appmarket.conf new file mode 100644 index 0000000..952c30d --- /dev/null +++ b/tmpl/sunstone-appmarket.conf @@ -0,0 +1,29 @@ +# -------------------------------------------------------------------------- # +# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs # +# # +# 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. # +#--------------------------------------------------------------------------- # + +################################################################################ +# AppMarket +################################################################################ + +# AppMarket username and password +# If no credentials are provided, an anonymous client will be used +# +:appmarket_username: %%appmarket_user +:appmarket_password: %%appmarket_password + +# AppMarket endpoint +# +:appmarket_url: %%appmarket_endpoint diff --git a/tmpl/sunstone-server.conf b/tmpl/sunstone-server.conf index 84f3fb5..9095744 100644 --- a/tmpl/sunstone-server.conf +++ b/tmpl/sunstone-server.conf @@ -155,3 +155,6 @@ %if %%getVar('activer_oneflow', 'non') == 'oui' - oneflow %end if +%if %%getVar('activer_market_views', 'non') == 'oui' + - appmarket +%end if diff --git a/tmpl/sunstone-views.yaml b/tmpl/sunstone-views.yaml index 098d3d5..2434f87 100644 --- a/tmpl/sunstone-views.yaml +++ b/tmpl/sunstone-views.yaml @@ -22,6 +22,10 @@ available_tabs: - oneflow-dashboard - oneflow-services - oneflow-templates +%end if +%if %%getVar('activer_market_views', 'non') == 'oui' + - apptools-appmarket-dashboard + - apptools-appmarket-appliances %end if - provision-tab - support-tab diff --git a/tmpl/user.yaml b/tmpl/user.yaml index a7ab1ec..4cc0aa5 100644 --- a/tmpl/user.yaml +++ b/tmpl/user.yaml @@ -25,6 +25,10 @@ enabled_tabs: oneflow-dashboard: false oneflow-services: false oneflow-templates: false +%end if +%if %%getVar('activer_market_views', 'non') == 'oui' + apptools-appmarket-dashboard: true + apptools-appmarket-appliances: true %end if support-tab: false doc-tab: false @@ -453,3 +457,34 @@ tabs: ServiceTemplate.chmod: true ServiceTemplate.delete: true %end if +%if %%getVar('activer_market_views', 'non') == 'oui' + apptools-appmarket-dashboard: + panel_tabs: + table_columns: + actions: + apptools-appmarket-appliances: + panel_tabs: + appmarketplace_info_tab: true + appmarketplace_jobs_tab: false + appmarketplace_template_tab: true + panel_tabs_actions: + appmarketplace_jobs_tab: + Job.del: false + table_columns: + - 0 # Checkbox + #- 1 # ID + - 2 # Name + #- 3 # Status + - 4 # Publisher + - 5 # Hypervisor + - 6 # Arch + - 7 # Format + #- 8 # Tags + - 9 # Created + actions: + AppMarket.refresh: true + AppMarket.import: true + AppMarket.delete: false + AppMarket.convert: false + AppMarket.create_dialog: false +%end if