[Mapbender-commits] r5756 -
trunk/mapbender/resources/db/pgsql/UTF-8/update
svn_mapbender at osgeo.org
svn_mapbender at osgeo.org
Sun Mar 14 10:59:07 EDT 2010
Author: verenadiewald
Date: 2010-03-14 10:59:06 -0400 (Sun, 14 Mar 2010)
New Revision: 5756
Modified:
trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
Log:
added sqls for new elements resultList_DetailPopup, resultList_Zoom, resultList_Highlight + some error corrections
Modified: trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql
===================================================================
--- trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql 2010-03-14 14:07:57 UTC (rev 5755)
+++ trunk/mapbender/resources/db/pgsql/UTF-8/update/update_2.6.1_to_2.7rc1_pgsql_UTF-8.sql 2010-03-14 14:59:06 UTC (rev 5756)
@@ -1100,7 +1100,6 @@
DELETE FROM gui_element_vars WHERE var_name = 'backGroundColor' AND fkey_e_id = 'navFrame';
DELETE FROM gui_element_vars WHERE var_name = 'backGroundHoverColor' AND fkey_e_id = 'navFrame';
-
-- set UI classes for treeGDE
UPDATE gui_element SET e_more_styles = 'visibility:hidden;overflow:auto', e_attributes = 'class="ui-widget ui-widget-content"'
WHERE e_id = 'treeGDE' AND fkey_gui_id IN
@@ -1110,27 +1109,6 @@
UPDATE gui_element SET e_more_styles = 'overflow:auto', e_attributes = 'class="ui-widget ui-widget-content"'
WHERE e_id = 'treeGDE' AND fkey_gui_id IN ('gui1');
--- add resultList to gui
-INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment,
-e_title, e_element, e_src, e_attributes, e_left, e_top, e_width,
-e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file,
-e_mb_mod, e_target, e_requires, e_url)
-VALUES('gui','resultList',2,1,'','Result List','div','','',NULL ,NULL
-,NULL ,NULL ,NULL
-,'','','div','mod_ResultList.js','../../lib/resultGeometryListController.js,
-../../lib/resultGeometryListModel.js','mapframe1','','');
-
-INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('gui','jq_ui',1,1,'The jQuery UI core','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','','../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/min.ui.core.js','','','');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'jq_ui', 'css', '../extensions/jquery-ui-1.7.2.custom/css/ui-lightness/jquery-ui-1.7.2.custom.css', '' ,'file/css');
-
-
-INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('gui','jq_ui_dialog',5,1,'Module to manage jQuery UI dialog windows with multiple options for customization.','','div','','',-1,-1,NULL ,NULL ,NULL ,'','','div','../plugins/jq_ui_dialog.js','../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/min.ui.dialog.js','','jq_ui','');
-
-INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url) VALUES('gui','jq_datatables',1,1,'Includes the jQuery plugin datatables, use like this
-$(selector).datatables(options)','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/jq_datatables.js','../extensions/dataTables-1.5/media/js/jquery.dataTables.min.js','','','http://www.datatables.net/');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type) VALUES('gui', 'jq_datatables', 'defaultCss', '../extensions/dataTables-1.5/media/css/demo_table_jui.css', '' ,'file/css');
-
-
-- add new container toolbox_jquery
INSERT INTO gui (gui_id, gui_name, gui_description, gui_public) VALUES ('toolbox_jquery','toolbox_jquery','All jQuery related elements in Mapbender',1);
INSERT INTO gui_element (fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element,e_src, e_attributes, e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires,e_url) VALUES ('toolbox_jquery','body',1,1,'body (obligatory)','','body','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','','','','','');
@@ -1178,7 +1156,6 @@
FROM gui_element WHERE gui_element.e_id = 'body' AND gui_element.fkey_gui_id
NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE var_name = 'jq_ui_theme');
-
--
-- add resultList to applications with element gazetteerWFS
--
@@ -1191,20 +1168,66 @@
gui_element.fkey_gui_id
NOT IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'resultList');
+--
+-- add element var position to element resultList
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList', 'position', '[100,100]', 'position of the result list dialog' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList' AND var_name = 'position');
--
+-- add element var resultListHeight to element resultList
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList', 'resultListHeight', '400', 'height of the result list dialog' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList' AND var_name = 'resultListHeight');
+
+--
+-- add element var resultListTitle to element resultList
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList', 'resultListTitle', 'Search results', 'title of the result list dialog' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList' AND var_name = 'resultListTitle');
+
+--
+-- add element var resultListWidth to element resultList
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList', 'resultListWidth', '800', 'width of the result list dialog' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList' AND var_name = 'resultListWidth');
+
+
+--
-- add jq_ui_dialog to applications with element gazetteerWFS
--
INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url)
-Select gui_element.fkey_gui_id ,'jq_ui_dialog',5,1,'Dialog from jQuery UI framework','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,
-'','','','../plugins/jq_ui_dialog.js','../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/min.ui.dialog.js','','jq_ui',''
+Select gui_element.fkey_gui_id ,'jq_ui_dialog',5,1,'Dialog from jQuery UI framework','','','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/jq_ui_dialog.js','../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/min.ui.dialog.js,../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/min.ui.draggable.js,../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/min.ui.resizable.js','','jq_ui',''
from gui_element WHERE
gui_element.e_id = 'gazetteerWFS' AND
gui_element.fkey_gui_id
NOT IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'jq_ui_dialog');
-
--
-- add jq_ui to applications with element gazetteerWFS
--
@@ -1217,7 +1240,6 @@
gui_element.fkey_gui_id
NOT IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'jq_ui');
-
--
-- add jq_datatables to applications with element gazetteerWFS
--
@@ -1231,50 +1253,170 @@
gui_element.fkey_gui_id
NOT IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'jq_datatables');
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
-SELECT gui_element.fkey_gui_id, 'jq_datatables','defaultCss', '../extensions/dataTables-1.5/media/css/demo_table_jui.css', '' ,'file/css'
-from gui_element
-WHERE
-gui_element.e_id = 'jq_datatables' AND
-gui_element.fkey_gui_id
-NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'jq_datatables' AND var_name = 'defaultCss');
+-- add CSS for jQuery datatables
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'body', 'jq_datatables_css', '../extensions/dataTables-1.5/media/css/demo_table_jui.min.css', 'css-file for jQuery datatables' ,'file/css'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'body' AND var_name = 'jq_datatables_css');
+-- add resultList_DetailPopup to all resultLists to keep old functionality
+INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
+ e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url)
+ SELECT fkey_gui_id,'resultList_DetailPopup',2,1,'Detail Popup For resultList','','div','','',
+ NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_DetailPopup.js', '', 'resultList','', 'http://www.mapbender.org/resultList_DetailPopup'
+
+ FROM gui_element WHERE
+ ( gui_element.e_id = 'resultList' AND
+ gui_element.fkey_gui_id NOT IN ( SELECT fkey_gui_id FROM gui_element WHERE e_id = 'resultList_DetailPopup')
+ ) ;
+
--
--- added PRIMARYKEy for Table gui_gui_category
+-- add element var detailPopupHeight to element resultList_DetailPopup
--
-Alter Table gui_gui_category ADD
- CONSTRAINT pk_gui_gui_category PRIMARY KEY (fkey_gui_id, fkey_gui_category_id);
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_DetailPopup', 'detailPopupHeight', '250', 'height of the result list detail popup' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_DetailPopup' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_DetailPopup' AND var_name = 'detailPopupHeight');
--
--- add Application toolbox_jquery to category
+-- add element var detailPopupTitle to element resultList_DetailPopup
--
-INSERT INTO gui_gui_category (fkey_gui_id, fkey_gui_category_id)
-VALUES('toolbox_jquery',2);
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_DetailPopup', 'detailPopupTitle', 'Details', 'title of the result list detail popup' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_DetailPopup' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_DetailPopup' AND var_name = 'detailPopupTitle');
+--
+-- add element var detailPopupWidth to element resultList_DetailPopup
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_DetailPopup', 'detailPopupWidth', '350', 'width of the result list detail popup' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_DetailPopup' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_DetailPopup' AND var_name = 'detailPopupWidth');
--- missing wz_jsgraphics in gazetteer
--- replacing obsolete tablesorter
-UPDATE gui_element SET e_mb_mod = 'geometry.js,requestGeometryConstructor.js,popup.js,../extensions/wz_jsgraphics.js' WHERE e_id = 'gazetteerWFS';
+--
+-- add element var position to element resultList_DetailPopup
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_DetailPopup', 'position', '[200,200]', 'position of the result list detail popup' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_DetailPopup' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_DetailPopup' AND var_name = 'position');
+--
+-- add resultList_Zoom to applications with element gazetteerWFS
+--
+INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
+e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url)
+Select gui_element.fkey_gui_id ,
+'resultList_Zoom',2,1,'zoom functionality for resultList','','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_Zoom.js','','resultList,mapframe1','','http://www.mapbender.org/resultList_Zoom'
+from gui_element WHERE
+gui_element.e_id = 'gazetteerWFS' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'resultList_Zoom');
+--
+-- add resultList_Highlight to applications with element gazetteerWFS
+--
+INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
+e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url)
+Select gui_element.fkey_gui_id ,
+'resultList_Highlight',2,1,'highlighting functionality for resultList','','div','','',NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_Highlight.js','','resultList,mapframe1','','http://www.mapbender.org/resultList_Highlight'
+from gui_element WHERE
+gui_element.e_id = 'gazetteerWFS' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'resultList_Highlight');
-INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
- e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url)
-Select fkey_gui_id,'jq_ui_draggable',5,1,'Draggable from the jQuery UI framework','','','','',
-NULL ,NULL ,NULL ,NULL ,NULL ,'','','','','../extensions/jquery-ui-1.7.2.custom/development-bundle/ui/min.ui.draggable.js','','jq_ui',
-'http://jqueryui.com/demos/draggable/'
-from gui_element WHERE
-gui_element.e_id = 'gazetteerWFS' AND
+--
+-- add element var maxHighlightedPoints to element resultList_Highlight
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_Highlight', 'maxHighlightedPoints', '500', 'max number of points to highlight' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_Highlight' AND
gui_element.fkey_gui_id
-NOT IN (SELECT fkey_gui_id FROM gui_element WHERE e_id = 'jq_ui_draggable');
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_Highlight' AND var_name = 'maxHighlightedPoints');
+--
+-- add element var resultHighlightColor to element resultList_Highlight
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_Highlight', 'resultHighlightColor', '#ff0000', 'color of the highlighting' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_Highlight' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_Highlight' AND var_name = 'resultHighlightColor');
+--
+-- add element var resultHighlightLineWidth to element resultList_Highlight
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_Highlight', 'resultHighlightLineWidth', '2', 'width of the highlighting line' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_Highlight' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_Highlight' AND var_name = 'resultHighlightLineWidth');
+--
+-- add element var resultHighlightZIndex to element resultList_Highlight
+--
+INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
+SELECT gui_element.fkey_gui_id,
+'resultList_Highlight', 'resultHighlightZIndex', '100', 'zindex of the highlighting' ,'var'
+from gui_element
+WHERE
+gui_element.e_id = 'resultList_Highlight' AND
+gui_element.fkey_gui_id
+NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'resultList_Highlight' AND var_name = 'resultHighlightZIndex');
+--
+-- delete deprecated element var maxHighlightedPoints of element gazetteerWFS
+--
+DELETE FROM gui_element_vars WHERE fkey_e_id = 'gazetteerWFS' AND var_name = 'maxHighlightedPoints';
+--
+-- added PRIMARYKEy for Table gui_gui_category
+--
+Alter Table gui_gui_category ADD
+ CONSTRAINT pk_gui_gui_category PRIMARY KEY (fkey_gui_id, fkey_gui_category_id);
+--
+-- add Application toolbox_jquery to category
+--
+INSERT INTO gui_gui_category (fkey_gui_id, fkey_gui_category_id)
+VALUES('toolbox_jquery',2);
+-- missing wz_jsgraphics in gazetteer
+-- replacing obsolete tablesorter
+UPDATE gui_element SET e_mb_mod = 'geometry.js,requestGeometryConstructor.js,popup.js,../extensions/wz_jsgraphics.js' WHERE e_id = 'gazetteerWFS';
+
+-- translation entry
INSERT INTO translations (locale, msgid, msgstr ) VALUES ('de', 'Add GeoRSS', 'GeoRSS hinzufügen');
-- remove deprecated attributes of gui element addWMS
@@ -1285,27 +1427,6 @@
INSERT INTO translations (locale, msgid, msgstr ) VALUES ('de', 'Search CSW', 'Katalogsuche');
--- add CSS for jQuery datatables
-INSERT INTO gui_element_vars(fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
-SELECT gui_element.fkey_gui_id,
-'body', 'jq_datatables_css', '../extensions/dataTables-1.5/media/css/demo_table_jui.min.css', 'css-file for jQuery datatables' ,'file/css'
-from gui_element
-WHERE
-gui_element.e_id = 'resultList' AND
-gui_element.fkey_gui_id
-NOT IN (SELECT fkey_gui_id FROM gui_element_vars WHERE fkey_e_id = 'body' AND var_name = 'jq_datatables_css');
-
--- add resultList_Popup to all resultLists to keep old functionality
-INSERT INTO gui_element(fkey_gui_id, e_id, e_pos, e_public, e_comment, e_title, e_element, e_src, e_attributes,
- e_left, e_top, e_width, e_height, e_z_index, e_more_styles, e_content, e_closetag, e_js_file, e_mb_mod, e_target, e_requires, e_url)
- SELECT fkey_gui_id,'resultList_Popup',2,1,'Popup For resultList','','div','','',
- NULL ,NULL ,NULL ,NULL ,NULL ,'','','','../plugins/mb_resultList_DetailPopup.js', '', 'resultList,mapframe1','', 'http://www.mapbender.org/ResultList'
-
- FROM gui_element WHERE
- ( gui_element.e_id = 'resultList' AND
- gui_element.fkey_gui_id NOT IN ( SELECT fkey_gui_id FROM gui_element WHERE e_id = 'resultList_Popup')
- ) ;
-
-- deactivate slippy map by default
INSERT INTO gui_element_vars (fkey_gui_id, fkey_e_id, var_name, var_value, context, var_type)
SELECT DISTINCT fkey_gui_id, 'mapframe1' AS fkey_e_id, 'slippy' AS var_name, '0' AS var_value,
More information about the Mapbender_commits
mailing list