Index: ivy.xml
===================================================================
--- ivy.xml (revision 32045)
+++ ivy.xml (working copy)
@@ -43,6 +43,6 @@
-
+
Index: main/plugin-queries-directory/plugin.xml
===================================================================
--- main/plugin-queries-directory/plugin.xml (revision 32045)
+++ main/plugin-queries-directory/plugin.xml (working copy)
@@ -42,13 +42,13 @@
+ point="org.ametys.core.ui.MessageTargetFactoriesManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
query
- js/Ametys/plugins/queriesdirectory/QueriesDAO.i18n.js
+ js/Ametys/plugins/queriesdirectory/QueriesDAO.js
js/Ametys/plugins/queriesdirectory/QueryMessageTargetFactory.js
@@ -58,17 +58,17 @@
+ point="org.ametys.core.ui.StaticFileImportsManager"
+ class="org.ametys.core.ui.StaticFileImportsClientSideElement">
js/Ametys/plugins/queriesdirectory/model/QueryFactory.js
js/Ametys/plugins/queriesdirectory/model/AbstractQuery.js
- js/Ametys/plugins/queriesdirectory/model/SimpleQuery.i18n.js
- js/Ametys/plugins/queriesdirectory/model/AdvancedQuery.i18n.js
- js/Ametys/plugins/queriesdirectory/model/SqlQuery.i18n.js
- js/Ametys/plugins/queriesdirectory/model/ScriptQuery.i18n.js
- js/Ametys/plugins/queriesdirectory/actions/QueriesActions.i18n.js
- js/Ametys/plugins/queriesdirectory/helper/CreateOrEditQuery.i18n.js
+ js/Ametys/plugins/queriesdirectory/model/SimpleQuery.js
+ js/Ametys/plugins/queriesdirectory/model/AdvancedQuery.js
+ js/Ametys/plugins/queriesdirectory/model/SqlQuery.js
+ js/Ametys/plugins/queriesdirectory/model/ScriptQuery.js
+ js/Ametys/plugins/queriesdirectory/actions/QueriesActions.js
+ js/Ametys/plugins/queriesdirectory/helper/CreateOrEditQuery.js
@@ -76,7 +76,7 @@
-
@@ -86,10 +86,13 @@
+ point="org.ametys.core.ui.StaticFileImportsManager"
+ class="org.ametys.core.ui.StaticFileImportsClientSideElement">
- js/Ametys/plugins/queriesdirectory/QuerySearchExtensions.i18n.js
+ js/Ametys/plugins/cms/search/SearchToolExtensions.js
+ js/Ametys/plugins/cms/search/SqlSearchToolExtensions.js
+ js/Ametys/plugins/cms/search/ScriptToolExtensions.js
+ js/Ametys/plugins/queriesdirectory/QuerySearchExtensions.js
QueriesDirectory_Rights_SaveQuery
@@ -99,8 +102,8 @@
+ point="org.ametys.core.ui.RibbonTabsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
^query$
@@ -112,8 +115,8 @@
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
Ametys.plugins.queriesdirectory.actions.QueriesActions.executeQuery
^query$
@@ -134,14 +137,13 @@
img/actions/execute_48.png
- js/Ametys/plugins/queriesdirectory/actions/QueriesActions.i18n.js
js/Ametys/plugins/queriesdirectory/controllers/QueryController.js
QueriesDirectory_Rights_Tool|QueriesDirectory_Rights_Admin
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
Ametys.plugins.queriesdirectory.actions.QueriesActions.openQuery
^query$
@@ -162,14 +164,13 @@
img/actions/edit_48.png
- js/Ametys/plugins/queriesdirectory/actions/QueriesActions.i18n.js
js/Ametys/plugins/queriesdirectory/controllers/QueryController.js
QueriesDirectory_Rights_Tool|QueriesDirectory_Rights_Admin
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
Ametys.plugins.queriesdirectory.actions.QueriesActions.editQuery
^query$
@@ -194,15 +195,14 @@
PLUGINS_QUERIESDIRECTORY_DESCRIPTION_NOWRITEACCESS
- js/Ametys/plugins/queriesdirectory/actions/QueriesActions.i18n.js
js/Ametys/plugins/queriesdirectory/controllers/QueryController.js
QueriesDirectory_Rights_Tool|QueriesDirectory_Rights_Admin
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
Ametys.plugins.queriesdirectory.actions.QueriesActions.deleteQuery
^query$
@@ -226,15 +226,14 @@
PLUGINS_QUERIESDIRECTORY_DESCRIPTION_NOWRITEACCESS
- js/Ametys/plugins/queriesdirectory/actions/QueriesActions.i18n.js
js/Ametys/plugins/queriesdirectory/controllers/QueryController.js
QueriesDirectory_Rights_Tool|QueriesDirectory_Rights_Admin
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
PLUGINS_QUERIESDIRECTORY_QUERY_IDENTIFIER_DESCRIPTION
@@ -252,7 +251,7 @@
-
@@ -261,7 +260,7 @@
-
@@ -271,8 +270,8 @@
Ametys.plugins.queriesdirectory.tool.QueriesTool
@@ -301,9 +300,9 @@
l
- js/Ametys/plugins/queriesdirectory/tool/QueriesTool/QueryEntry.i18n.js
- js/Ametys/plugins/queriesdirectory/helper/ChooseQuery.i18n.js
- js/Ametys/plugins/queriesdirectory/tool/QueriesTool.i18n.js
+ js/Ametys/plugins/queriesdirectory/tool/QueriesTool/QueryEntry.js
+ js/Ametys/plugins/queriesdirectory/helper/ChooseQuery.js
+ js/Ametys/plugins/queriesdirectory/tool/QueriesTool.js
@@ -316,8 +315,8 @@
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
uitool-query-rights
^query$
@@ -348,8 +347,8 @@
+ point="org.ametys.core.ui.UIToolsFactoriesManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
uitool-query-rights
Ametys.plugins.queriesdirectory.tool.QueryRightsTool
@@ -367,7 +366,7 @@
r
- js/Ametys/plugins/queriesdirectory/tool/QueryRightsTool.i18n.js
+ js/Ametys/plugins/queriesdirectory/tool/QueryRightsTool.js
js/Ametys/plugins/queriesdirectory/tool/QueryRightsTool/QueryRightsEntry.js
@@ -376,8 +375,8 @@
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
Ametys.plugins.queriesdirectory.actions.QueryRightsActions.changeVisibility
^query$
@@ -403,13 +402,13 @@
js/Ametys/plugins/queriesdirectory/controllers/QueryController.js
- js/Ametys/plugins/queriesdirectory/actions/QueryRightsActions.i18n.js
+ js/Ametys/plugins/queriesdirectory/actions/QueryRightsActions.js
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
Ametys.plugins.queriesdirectory.actions.QueryRightsActions.changeVisibility
^query$
@@ -435,13 +434,13 @@
js/Ametys/plugins/queriesdirectory/controllers/QueryController.js
- js/Ametys/plugins/queriesdirectory/actions/QueryRightsActions.i18n.js
+ js/Ametys/plugins/queriesdirectory/actions/QueryRightsActions.js
+ point="org.ametys.core.ui.RibbonControlsManager"
+ class="org.ametys.core.ui.StaticClientSideElement">
Ametys.plugins.queriesdirectory.actions.QueryRightsActions.changeVisibility
^query$
@@ -467,13 +466,13 @@
js/Ametys/plugins/queriesdirectory/controllers/QueryController.js
- js/Ametys/plugins/queriesdirectory/actions/QueryRightsActions.i18n.js
+ js/Ametys/plugins/queriesdirectory/actions/QueryRightsActions.js