From 3fd0762ae03436e7bdc8f4275003d034574427ca Mon Sep 17 00:00:00 2001 From: John Ralls Date: Sun, 23 Jun 2013 22:47:25 +0000 Subject: [PATCH] Move the HTML resources from gramps/plugins/webstuff to data and images So that they're together with the other resources instead of in site-package/gramps. Aside from a better source and installation layout, this makes it easier to bundle them. svn: r22576 --- .../plugins/webstuff => data}/css/GeoView.css | 0 .../webstuff => data}/css/Web_Basic-Ash.css | 0 .../webstuff => data}/css/Web_Basic-Blue.css | 0 .../css/Web_Basic-Cypress.css | 0 .../webstuff => data}/css/Web_Basic-Lilac.css | 0 .../webstuff => data}/css/Web_Basic-Peach.css | 0 .../css/Web_Basic-Spruce.css | 0 .../css/Web_Citations-Animated.css | 0 .../css/Web_Citations-Outline.css | 0 .../css/Web_DropDown-Menus.css | 0 .../webstuff => data}/css/Web_Fade-Menus.css | 0 .../css/Web_Horizontal-Menus.css | 0 .../webstuff => data}/css/Web_Mainz.css | 0 .../webstuff => data}/css/Web_Nebraska.css | 0 .../css/Web_Print-Default.css | 0 .../css/Web_Vertical-Menus.css | 0 .../webstuff => data}/css/Web_Visually.css | 0 .../webstuff => data}/css/ancestortree.css | 0 .../webstuff => data}/css/behaviour.css | 0 .../webstuff => data}/css/jquery.flexbox.css | 0 .../webstuff => data}/css/narrative-maps.css | 0 .../images/ui-bg_diamond_10_4f4221_10x8.png | Bin .../images/ui-bg_diamond_20_372806_10x8.png | Bin .../images/ui-bg_diamond_25_675423_10x8.png | Bin .../images/ui-bg_diamond_25_d5ac5d_10x8.png | Bin .../images/ui-bg_diamond_8_261803_10x8.png | Bin .../images/ui-bg_diamond_8_443113_10x8.png | Bin .../images/ui-bg_flat_75_ddd4b0_40x100.png | Bin .../ui-bg_highlight-hard_65_fee4bd_1x100.png | Bin .../images/ui-icons_070603_256x240.png | Bin .../images/ui-icons_e8e2b5_256x240.png | Bin .../images/ui-icons_e9cd86_256x240.png | Bin .../images/ui-icons_efec9f_256x240.png | Bin .../images/ui-icons_f2ec64_256x240.png | Bin .../images/ui-icons_f9f2bd_256x240.png | Bin .../images/ui-icons_ff7519_256x240.png | Bin .../swanky-purse/jquery-ui-1.7.2.custom.css | 0 .../swanky-purse/jquery-ui-1.7.3.custom.css | 0 .../javascript/jquery-1.3.2.min.js | 0 .../javascript/jquery-1.7.1.js | 0 .../javascript/jquery-1.7.1.min.js | 0 .../javascript/jquery-ui-1.7.2.custom.min.js | 0 .../javascript/jquery.flexbox.js | 0 .../javascript/jquery.flexbox.min.js | 0 gramps/gen/const.py | 2 - gramps/plugins/docgen/htmldoc.py | 4 +- gramps/plugins/webstuff/images/document.png | Bin 2855 -> 0 bytes .../webstuff/images/gramps-geo-altmap.svg | 177 -- .../webstuff/images/gramps-geo-birth.svg | 1370 ---------------- .../webstuff/images/gramps-geo-death.svg | 1438 ----------------- .../webstuff/images/gramps-geo-mainmap.svg | 162 -- .../webstuff/images/gramps-geo-marriage.svg | 1052 ------------ gramps/plugins/webstuff/webstuff.py | 11 +- .../webstuff}/Web_Gender_Female.png | Bin .../webstuff}/Web_Gender_Male.png | Bin .../webstuff}/Web_Mainz_Bkgd.png | Bin .../webstuff}/Web_Mainz_Header.png | Bin .../webstuff}/Web_Mainz_Mid.png | Bin .../webstuff}/Web_Mainz_MidLight.png | Bin .../images => images/webstuff}/blank.gif | Bin .../images => images/webstuff}/crosshairs.png | Bin .../images => images/webstuff}/favicon.ico | Bin .../images => images/webstuff}/favicon2.ico | Bin .../webstuff}/gramps-geo-altmap.png | Bin .../webstuff}/gramps-geo-birth.png | Bin .../webstuff}/gramps-geo-death.png | Bin .../webstuff}/gramps-geo-mainmap.png | Bin .../webstuff}/gramps-geo-marriage.png | Bin .../webstuff}/somerights20.gif | Bin mac/gramps.bundle | 4 - setup.py | 20 +- 71 files changed, 19 insertions(+), 4221 deletions(-) rename {gramps/plugins/webstuff => data}/css/GeoView.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Basic-Ash.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Basic-Blue.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Basic-Cypress.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Basic-Lilac.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Basic-Peach.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Basic-Spruce.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Citations-Animated.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Citations-Outline.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_DropDown-Menus.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Fade-Menus.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Horizontal-Menus.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Mainz.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Nebraska.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Print-Default.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Vertical-Menus.css (100%) rename {gramps/plugins/webstuff => data}/css/Web_Visually.css (100%) rename {gramps/plugins/webstuff => data}/css/ancestortree.css (100%) rename {gramps/plugins/webstuff => data}/css/behaviour.css (100%) rename {gramps/plugins/webstuff => data}/css/jquery.flexbox.css (100%) rename {gramps/plugins/webstuff => data}/css/narrative-maps.css (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_diamond_8_261803_10x8.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_flat_75_ddd4b0_40x100.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-icons_070603_256x240.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-icons_e8e2b5_256x240.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-icons_e9cd86_256x240.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-icons_efec9f_256x240.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-icons_f2ec64_256x240.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/images/ui-icons_ff7519_256x240.png (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/jquery-ui-1.7.2.custom.css (100%) rename {gramps/plugins/webstuff => data}/css/swanky-purse/jquery-ui-1.7.3.custom.css (100%) rename {gramps/plugins/webstuff => data}/javascript/jquery-1.3.2.min.js (100%) rename {gramps/plugins/webstuff => data}/javascript/jquery-1.7.1.js (100%) rename {gramps/plugins/webstuff => data}/javascript/jquery-1.7.1.min.js (100%) rename {gramps/plugins/webstuff => data}/javascript/jquery-ui-1.7.2.custom.min.js (100%) rename {gramps/plugins/webstuff => data}/javascript/jquery.flexbox.js (100%) rename {gramps/plugins/webstuff => data}/javascript/jquery.flexbox.min.js (100%) delete mode 100644 gramps/plugins/webstuff/images/document.png delete mode 100644 gramps/plugins/webstuff/images/gramps-geo-altmap.svg delete mode 100644 gramps/plugins/webstuff/images/gramps-geo-birth.svg delete mode 100644 gramps/plugins/webstuff/images/gramps-geo-death.svg delete mode 100644 gramps/plugins/webstuff/images/gramps-geo-mainmap.svg delete mode 100644 gramps/plugins/webstuff/images/gramps-geo-marriage.svg rename {gramps/plugins/webstuff/images => images/webstuff}/Web_Gender_Female.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/Web_Gender_Male.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/Web_Mainz_Bkgd.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/Web_Mainz_Header.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/Web_Mainz_Mid.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/Web_Mainz_MidLight.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/blank.gif (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/crosshairs.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/favicon.ico (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/favicon2.ico (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/gramps-geo-altmap.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/gramps-geo-birth.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/gramps-geo-death.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/gramps-geo-mainmap.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/gramps-geo-marriage.png (100%) rename {gramps/plugins/webstuff/images => images/webstuff}/somerights20.gif (100%) diff --git a/gramps/plugins/webstuff/css/GeoView.css b/data/css/GeoView.css similarity index 100% rename from gramps/plugins/webstuff/css/GeoView.css rename to data/css/GeoView.css diff --git a/gramps/plugins/webstuff/css/Web_Basic-Ash.css b/data/css/Web_Basic-Ash.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Basic-Ash.css rename to data/css/Web_Basic-Ash.css diff --git a/gramps/plugins/webstuff/css/Web_Basic-Blue.css b/data/css/Web_Basic-Blue.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Basic-Blue.css rename to data/css/Web_Basic-Blue.css diff --git a/gramps/plugins/webstuff/css/Web_Basic-Cypress.css b/data/css/Web_Basic-Cypress.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Basic-Cypress.css rename to data/css/Web_Basic-Cypress.css diff --git a/gramps/plugins/webstuff/css/Web_Basic-Lilac.css b/data/css/Web_Basic-Lilac.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Basic-Lilac.css rename to data/css/Web_Basic-Lilac.css diff --git a/gramps/plugins/webstuff/css/Web_Basic-Peach.css b/data/css/Web_Basic-Peach.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Basic-Peach.css rename to data/css/Web_Basic-Peach.css diff --git a/gramps/plugins/webstuff/css/Web_Basic-Spruce.css b/data/css/Web_Basic-Spruce.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Basic-Spruce.css rename to data/css/Web_Basic-Spruce.css diff --git a/gramps/plugins/webstuff/css/Web_Citations-Animated.css b/data/css/Web_Citations-Animated.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Citations-Animated.css rename to data/css/Web_Citations-Animated.css diff --git a/gramps/plugins/webstuff/css/Web_Citations-Outline.css b/data/css/Web_Citations-Outline.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Citations-Outline.css rename to data/css/Web_Citations-Outline.css diff --git a/gramps/plugins/webstuff/css/Web_DropDown-Menus.css b/data/css/Web_DropDown-Menus.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_DropDown-Menus.css rename to data/css/Web_DropDown-Menus.css diff --git a/gramps/plugins/webstuff/css/Web_Fade-Menus.css b/data/css/Web_Fade-Menus.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Fade-Menus.css rename to data/css/Web_Fade-Menus.css diff --git a/gramps/plugins/webstuff/css/Web_Horizontal-Menus.css b/data/css/Web_Horizontal-Menus.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Horizontal-Menus.css rename to data/css/Web_Horizontal-Menus.css diff --git a/gramps/plugins/webstuff/css/Web_Mainz.css b/data/css/Web_Mainz.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Mainz.css rename to data/css/Web_Mainz.css diff --git a/gramps/plugins/webstuff/css/Web_Nebraska.css b/data/css/Web_Nebraska.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Nebraska.css rename to data/css/Web_Nebraska.css diff --git a/gramps/plugins/webstuff/css/Web_Print-Default.css b/data/css/Web_Print-Default.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Print-Default.css rename to data/css/Web_Print-Default.css diff --git a/gramps/plugins/webstuff/css/Web_Vertical-Menus.css b/data/css/Web_Vertical-Menus.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Vertical-Menus.css rename to data/css/Web_Vertical-Menus.css diff --git a/gramps/plugins/webstuff/css/Web_Visually.css b/data/css/Web_Visually.css similarity index 100% rename from gramps/plugins/webstuff/css/Web_Visually.css rename to data/css/Web_Visually.css diff --git a/gramps/plugins/webstuff/css/ancestortree.css b/data/css/ancestortree.css similarity index 100% rename from gramps/plugins/webstuff/css/ancestortree.css rename to data/css/ancestortree.css diff --git a/gramps/plugins/webstuff/css/behaviour.css b/data/css/behaviour.css similarity index 100% rename from gramps/plugins/webstuff/css/behaviour.css rename to data/css/behaviour.css diff --git a/gramps/plugins/webstuff/css/jquery.flexbox.css b/data/css/jquery.flexbox.css similarity index 100% rename from gramps/plugins/webstuff/css/jquery.flexbox.css rename to data/css/jquery.flexbox.css diff --git a/gramps/plugins/webstuff/css/narrative-maps.css b/data/css/narrative-maps.css similarity index 100% rename from gramps/plugins/webstuff/css/narrative-maps.css rename to data/css/narrative-maps.css diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png b/data/css/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png rename to data/css/swanky-purse/images/ui-bg_diamond_10_4f4221_10x8.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png b/data/css/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png rename to data/css/swanky-purse/images/ui-bg_diamond_20_372806_10x8.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png b/data/css/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png rename to data/css/swanky-purse/images/ui-bg_diamond_25_675423_10x8.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png b/data/css/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png rename to data/css/swanky-purse/images/ui-bg_diamond_25_d5ac5d_10x8.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_8_261803_10x8.png b/data/css/swanky-purse/images/ui-bg_diamond_8_261803_10x8.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_8_261803_10x8.png rename to data/css/swanky-purse/images/ui-bg_diamond_8_261803_10x8.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png b/data/css/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png rename to data/css/swanky-purse/images/ui-bg_diamond_8_443113_10x8.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_flat_75_ddd4b0_40x100.png b/data/css/swanky-purse/images/ui-bg_flat_75_ddd4b0_40x100.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_flat_75_ddd4b0_40x100.png rename to data/css/swanky-purse/images/ui-bg_flat_75_ddd4b0_40x100.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.png b/data/css/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.png rename to data/css/swanky-purse/images/ui-bg_highlight-hard_65_fee4bd_1x100.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_070603_256x240.png b/data/css/swanky-purse/images/ui-icons_070603_256x240.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_070603_256x240.png rename to data/css/swanky-purse/images/ui-icons_070603_256x240.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_e8e2b5_256x240.png b/data/css/swanky-purse/images/ui-icons_e8e2b5_256x240.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_e8e2b5_256x240.png rename to data/css/swanky-purse/images/ui-icons_e8e2b5_256x240.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_e9cd86_256x240.png b/data/css/swanky-purse/images/ui-icons_e9cd86_256x240.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_e9cd86_256x240.png rename to data/css/swanky-purse/images/ui-icons_e9cd86_256x240.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_efec9f_256x240.png b/data/css/swanky-purse/images/ui-icons_efec9f_256x240.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_efec9f_256x240.png rename to data/css/swanky-purse/images/ui-icons_efec9f_256x240.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_f2ec64_256x240.png b/data/css/swanky-purse/images/ui-icons_f2ec64_256x240.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_f2ec64_256x240.png rename to data/css/swanky-purse/images/ui-icons_f2ec64_256x240.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png b/data/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png rename to data/css/swanky-purse/images/ui-icons_f9f2bd_256x240.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_ff7519_256x240.png b/data/css/swanky-purse/images/ui-icons_ff7519_256x240.png similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/images/ui-icons_ff7519_256x240.png rename to data/css/swanky-purse/images/ui-icons_ff7519_256x240.png diff --git a/gramps/plugins/webstuff/css/swanky-purse/jquery-ui-1.7.2.custom.css b/data/css/swanky-purse/jquery-ui-1.7.2.custom.css similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/jquery-ui-1.7.2.custom.css rename to data/css/swanky-purse/jquery-ui-1.7.2.custom.css diff --git a/gramps/plugins/webstuff/css/swanky-purse/jquery-ui-1.7.3.custom.css b/data/css/swanky-purse/jquery-ui-1.7.3.custom.css similarity index 100% rename from gramps/plugins/webstuff/css/swanky-purse/jquery-ui-1.7.3.custom.css rename to data/css/swanky-purse/jquery-ui-1.7.3.custom.css diff --git a/gramps/plugins/webstuff/javascript/jquery-1.3.2.min.js b/data/javascript/jquery-1.3.2.min.js similarity index 100% rename from gramps/plugins/webstuff/javascript/jquery-1.3.2.min.js rename to data/javascript/jquery-1.3.2.min.js diff --git a/gramps/plugins/webstuff/javascript/jquery-1.7.1.js b/data/javascript/jquery-1.7.1.js similarity index 100% rename from gramps/plugins/webstuff/javascript/jquery-1.7.1.js rename to data/javascript/jquery-1.7.1.js diff --git a/gramps/plugins/webstuff/javascript/jquery-1.7.1.min.js b/data/javascript/jquery-1.7.1.min.js similarity index 100% rename from gramps/plugins/webstuff/javascript/jquery-1.7.1.min.js rename to data/javascript/jquery-1.7.1.min.js diff --git a/gramps/plugins/webstuff/javascript/jquery-ui-1.7.2.custom.min.js b/data/javascript/jquery-ui-1.7.2.custom.min.js similarity index 100% rename from gramps/plugins/webstuff/javascript/jquery-ui-1.7.2.custom.min.js rename to data/javascript/jquery-ui-1.7.2.custom.min.js diff --git a/gramps/plugins/webstuff/javascript/jquery.flexbox.js b/data/javascript/jquery.flexbox.js similarity index 100% rename from gramps/plugins/webstuff/javascript/jquery.flexbox.js rename to data/javascript/jquery.flexbox.js diff --git a/gramps/plugins/webstuff/javascript/jquery.flexbox.min.js b/data/javascript/jquery.flexbox.min.js similarity index 100% rename from gramps/plugins/webstuff/javascript/jquery.flexbox.min.js rename to data/javascript/jquery.flexbox.min.js diff --git a/gramps/gen/const.py b/gramps/gen/const.py index 5b67fba57..485be18b2 100644 --- a/gramps/gen/const.py +++ b/gramps/gen/const.py @@ -160,8 +160,6 @@ RULE_GLADE = os.path.join(GLADE_DIR, "rule.glade") PLUGINS_DIR = os.path.join(ROOT_DIR, "plugins") WEB_DIR = os.path.join(ROOT_DIR, 'webapp') -WEBSTUFF_DIR = os.path.join(PLUGINS_DIR, "webstuff") -WEBSTUFF_IMAGE_DIR = os.path.join(WEBSTUFF_DIR, "images") USE_TIPS = False diff --git a/gramps/plugins/docgen/htmldoc.py b/gramps/plugins/docgen/htmldoc.py index 2c0a9d24a..4371c52ae 100644 --- a/gramps/plugins/docgen/htmldoc.py +++ b/gramps/plugins/docgen/htmldoc.py @@ -48,7 +48,7 @@ import time from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.gettext from gramps.gen.utils.image import resize_to_jpeg -from gramps.gen.const import DATA_DIR, WEBSTUFF_IMAGE_DIR, PROGRAM_NAME, URL_HOMEPAGE +from gramps.gen.const import DATA_DIR, IMAGE_DIR, PROGRAM_NAME, URL_HOMEPAGE from gramps.version import VERSION from gramps.gen.plug.docgen import BaseDoc, TextDoc, FONT_SANS_SERIF, URL_PATTERN from gramps.plugins.lib.libhtmlbackend import HtmlBackend, process_spaces @@ -298,7 +298,7 @@ class HtmlDoc(BaseDoc, TextDoc): if os.path.exists(fullpath): self.copy_file(fullpath, _HTMLSCREEN) #favicon - self.copy_file(os.path.join(WEBSTUFF_IMAGE_DIR, 'favicon.ico'), + self.copy_file(os.path.join(IMAGE_DIR, 'favicon.ico'), 'favicon.ico') def __reduce_list(self): diff --git a/gramps/plugins/webstuff/images/document.png b/gramps/plugins/webstuff/images/document.png deleted file mode 100644 index bfe4bad56cecfb2fb3dd3b1a21a0f7a79bf8f96e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2855 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 FV1jOyTQdLv diff --git a/gramps/plugins/webstuff/images/gramps-geo-altmap.svg b/gramps/plugins/webstuff/images/gramps-geo-altmap.svg deleted file mode 100644 index 1b92d4c26..000000000 --- a/gramps/plugins/webstuff/images/gramps-geo-altmap.svg +++ /dev/null @@ -1,177 +0,0 @@ - - - - - gramps-geo-altmap - - - - - - - - - - - - - - - - - - - - image/svg+xml - - gramps-geo-altmap - - 2009-09-07 - - - Serge Noiraud - - - used to select the proprietary map. - - - - - - - - - - - - - - - - - - - diff --git a/gramps/plugins/webstuff/images/gramps-geo-birth.svg b/gramps/plugins/webstuff/images/gramps-geo-birth.svg deleted file mode 100644 index e88c5000a..000000000 --- a/gramps/plugins/webstuff/images/gramps-geo-birth.svg +++ /dev/null @@ -1,1370 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Find - - - document - search - find - - - - - - Lapo Calamandrei - - - - - - Jakub Steiner - - - 2006-04-21 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gramps/plugins/webstuff/images/gramps-geo-death.svg b/gramps/plugins/webstuff/images/gramps-geo-death.svg deleted file mode 100644 index 37c9fdc71..000000000 --- a/gramps/plugins/webstuff/images/gramps-geo-death.svg +++ /dev/null @@ -1,1438 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - Find - - - document - search - find - - - - - - Lapo Calamandrei - - - - - - Jakub Steiner - - - 2006-04-21 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gramps/plugins/webstuff/images/gramps-geo-mainmap.svg b/gramps/plugins/webstuff/images/gramps-geo-mainmap.svg deleted file mode 100644 index 09814069c..000000000 --- a/gramps/plugins/webstuff/images/gramps-geo-mainmap.svg +++ /dev/null @@ -1,162 +0,0 @@ - - - - - gramps-geo-mainmap - - - - - - - - - - - - - - - image/svg+xml - - gramps-geo-mainmap - 2009-09-07 - - - Serge Noiraud - - - used to select the openstreetmap map. - - - - - - - - - - - - - - - - - - - - - - diff --git a/gramps/plugins/webstuff/images/gramps-geo-marriage.svg b/gramps/plugins/webstuff/images/gramps-geo-marriage.svg deleted file mode 100644 index 2087e3a62..000000000 --- a/gramps/plugins/webstuff/images/gramps-geo-marriage.svg +++ /dev/null @@ -1,1052 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - document - search - find - - - - - - Lapo Calamandrei - - - - - - Jakub Steiner - - - 2006-04-21 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gramps/plugins/webstuff/webstuff.py b/gramps/plugins/webstuff/webstuff.py index 5aebfe56a..12741be46 100644 --- a/gramps/plugins/webstuff/webstuff.py +++ b/gramps/plugins/webstuff/webstuff.py @@ -25,7 +25,7 @@ # python modules #------------------------------------------------ import os -from gramps.gen.const import VERSION_DIR +from gramps.gen.const import VERSION_DIR, IMAGE_DIR, DATA_DIR from gramps.gen.const import GRAMPS_LOCALE as glocale _ = glocale.translation.sgettext @@ -47,11 +47,10 @@ def load_on_reg(dbstate, uistate, plugin): """ Runs when plugin is registered. """ - dir, fname = os.path.split(__file__) from functools import partial - path_css = partial(os.path.join, dir, "css") - path_img = partial(os.path.join, dir, "images") - path_js = partial(os.path.join, dir, "js") + path_css = partial(os.path.join, DATA_DIR, "css") + path_img = partial(os.path.join, IMAGE_DIR, "webstuff") + path_js = partial(os.path.join, DATA_DIR, "javascript") CSS_FILES = [ # id, user selectable?, translated_name, option name, fullpath, @@ -160,7 +159,7 @@ def load_on_reg(dbstate, uistate, plugin): # Document image ["Document", 0, "Document", - path_img("document.png"), None, [], [] ], + os.path.join(IMAGE_DIR, "document.png"), None, [], [] ], # blank ["Blank", 0, "Blank", diff --git a/gramps/plugins/webstuff/images/Web_Gender_Female.png b/images/webstuff/Web_Gender_Female.png similarity index 100% rename from gramps/plugins/webstuff/images/Web_Gender_Female.png rename to images/webstuff/Web_Gender_Female.png diff --git a/gramps/plugins/webstuff/images/Web_Gender_Male.png b/images/webstuff/Web_Gender_Male.png similarity index 100% rename from gramps/plugins/webstuff/images/Web_Gender_Male.png rename to images/webstuff/Web_Gender_Male.png diff --git a/gramps/plugins/webstuff/images/Web_Mainz_Bkgd.png b/images/webstuff/Web_Mainz_Bkgd.png similarity index 100% rename from gramps/plugins/webstuff/images/Web_Mainz_Bkgd.png rename to images/webstuff/Web_Mainz_Bkgd.png diff --git a/gramps/plugins/webstuff/images/Web_Mainz_Header.png b/images/webstuff/Web_Mainz_Header.png similarity index 100% rename from gramps/plugins/webstuff/images/Web_Mainz_Header.png rename to images/webstuff/Web_Mainz_Header.png diff --git a/gramps/plugins/webstuff/images/Web_Mainz_Mid.png b/images/webstuff/Web_Mainz_Mid.png similarity index 100% rename from gramps/plugins/webstuff/images/Web_Mainz_Mid.png rename to images/webstuff/Web_Mainz_Mid.png diff --git a/gramps/plugins/webstuff/images/Web_Mainz_MidLight.png b/images/webstuff/Web_Mainz_MidLight.png similarity index 100% rename from gramps/plugins/webstuff/images/Web_Mainz_MidLight.png rename to images/webstuff/Web_Mainz_MidLight.png diff --git a/gramps/plugins/webstuff/images/blank.gif b/images/webstuff/blank.gif similarity index 100% rename from gramps/plugins/webstuff/images/blank.gif rename to images/webstuff/blank.gif diff --git a/gramps/plugins/webstuff/images/crosshairs.png b/images/webstuff/crosshairs.png similarity index 100% rename from gramps/plugins/webstuff/images/crosshairs.png rename to images/webstuff/crosshairs.png diff --git a/gramps/plugins/webstuff/images/favicon.ico b/images/webstuff/favicon.ico similarity index 100% rename from gramps/plugins/webstuff/images/favicon.ico rename to images/webstuff/favicon.ico diff --git a/gramps/plugins/webstuff/images/favicon2.ico b/images/webstuff/favicon2.ico similarity index 100% rename from gramps/plugins/webstuff/images/favicon2.ico rename to images/webstuff/favicon2.ico diff --git a/gramps/plugins/webstuff/images/gramps-geo-altmap.png b/images/webstuff/gramps-geo-altmap.png similarity index 100% rename from gramps/plugins/webstuff/images/gramps-geo-altmap.png rename to images/webstuff/gramps-geo-altmap.png diff --git a/gramps/plugins/webstuff/images/gramps-geo-birth.png b/images/webstuff/gramps-geo-birth.png similarity index 100% rename from gramps/plugins/webstuff/images/gramps-geo-birth.png rename to images/webstuff/gramps-geo-birth.png diff --git a/gramps/plugins/webstuff/images/gramps-geo-death.png b/images/webstuff/gramps-geo-death.png similarity index 100% rename from gramps/plugins/webstuff/images/gramps-geo-death.png rename to images/webstuff/gramps-geo-death.png diff --git a/gramps/plugins/webstuff/images/gramps-geo-mainmap.png b/images/webstuff/gramps-geo-mainmap.png similarity index 100% rename from gramps/plugins/webstuff/images/gramps-geo-mainmap.png rename to images/webstuff/gramps-geo-mainmap.png diff --git a/gramps/plugins/webstuff/images/gramps-geo-marriage.png b/images/webstuff/gramps-geo-marriage.png similarity index 100% rename from gramps/plugins/webstuff/images/gramps-geo-marriage.png rename to images/webstuff/gramps-geo-marriage.png diff --git a/gramps/plugins/webstuff/images/somerights20.gif b/images/webstuff/somerights20.gif similarity index 100% rename from gramps/plugins/webstuff/images/somerights20.gif rename to images/webstuff/somerights20.gif diff --git a/mac/gramps.bundle b/mac/gramps.bundle index 8b2bc4a30..d09962cec 100644 --- a/mac/gramps.bundle +++ b/mac/gramps.bundle @@ -72,10 +72,6 @@ ${prefix}/lib/enchant - - ${prefix}/lib/libgettextpo.0.dylib - - ${prefix}/lib/libosmgpsmap.3.dylib diff --git a/setup.py b/setup.py index 6c03cb958..1d1802dc8 100644 --- a/setup.py +++ b/setup.py @@ -358,13 +358,6 @@ for (dirpath, dirnames, filenames) in os.walk(basedir): #we add to data_list so glade , xml, files are found, we don't need the gramps/ part package_data_core.append(dirpath[7:] + '/' + dirname + '/*.glade') package_data_core.append(dirpath[7:] + '/' + dirname + '/*.xml') - package_data_core.append(dirpath[7:] + '/' + dirname + '/*.png') - package_data_core.append(dirpath[7:] + '/' + dirname + '/*.svg') - package_data_core.append(dirpath[7:] + '/' + dirname + '/*.css') - package_data_core.append(dirpath[7:] + '/' + dirname + '/*.html') - package_data_core.append(dirpath[7:] + '/' + dirname + '/*.js') -package_data_core.append('plugins/webstuff/images/*.gif') -package_data_core.append('plugins/webstuff/images/*.ico') package_data_core.append('gen/utils/resource-path') package_data_gui = ['gui/glade/*.glade'] @@ -387,9 +380,20 @@ DOC_FILES = ['AUTHORS', 'COPYING', 'FAQ', 'INSTALL', 'LICENSE', 'NEWS', 'README', 'TODO'] GEDCOM_FILES = glob.glob(os.path.join('example', 'gedcom', '*.*')) GRAMPS_FILES = glob.glob(os.path.join('example', 'gramps', '*.*')) +IMAGE_WEB = glob.glob(os.path.join('images', 'webstuff', '*.png')) +IMAGE_WEB.extend(glob.glob(os.path.join('images', 'webstuff','*.ico'))) +IMAGE_WEB.extend(glob.glob(os.path.join('images', 'webstuff', '*.gif'))) +JS_FILES = glob.glob(os.path.join('data', 'javascript', '*.js')) +CSS_FILES = glob.glob(os.path.join('data', 'css', '*.css')) +SWANKY_PURSE = glob.glob(os.path.join('data', 'css', 'swanky-purse', '*.css')) +SWANKY_IMG = glob.glob(os.path.join('data', 'css', 'swanky-purse', 'images', '*.png')) data_files_core.append(('share/doc/gramps', DOC_FILES)) data_files_core.append(('share/doc/gramps/example/gedcom', GEDCOM_FILES)) -data_files_core.append(('share/doc/gramps/example/gramps', GRAMPS_FILES)) +data_files_core.append(('share/doc/gramps/example/gramps', GRAMPS_FILES)) +data_files_core.append(('share/gramps/images', IMAGE_WEB)) +data_files_core.append(('share/gramps/css', CSS_FILES)) +data_files_core.append(('share/gramps/css/swanky-purse', SWANKY_PURSE)) +data_files_core.append(('share/gramps/css/swanky-purse/images', SWANKY_IMG)) PNG_FILES = glob.glob(os.path.join('data', '*.png')) SVG_FILES = glob.glob(os.path.join('data', '*.svg'))