diff --git a/data/images/Web_Gender_Female.png b/data/images/Web_Gender_Female.png new file mode 100644 index 000000000..6b238f01a Binary files /dev/null and b/data/images/Web_Gender_Female.png differ diff --git a/data/images/Web_Gender_Male.png b/data/images/Web_Gender_Male.png new file mode 100644 index 000000000..0f48038b5 Binary files /dev/null and b/data/images/Web_Gender_Male.png differ diff --git a/data/images/Web_Mainz_Bkgd.png b/data/images/Web_Mainz_Bkgd.png new file mode 100644 index 000000000..bb72285eb Binary files /dev/null and b/data/images/Web_Mainz_Bkgd.png differ diff --git a/data/images/Web_Mainz_Header.png b/data/images/Web_Mainz_Header.png new file mode 100644 index 000000000..563540560 Binary files /dev/null and b/data/images/Web_Mainz_Header.png differ diff --git a/data/images/Web_Mainz_Mid.png b/data/images/Web_Mainz_Mid.png new file mode 100644 index 000000000..5d85320ab Binary files /dev/null and b/data/images/Web_Mainz_Mid.png differ diff --git a/data/images/Web_Mainz_MidLight.png b/data/images/Web_Mainz_MidLight.png new file mode 100644 index 000000000..42fe83320 Binary files /dev/null and b/data/images/Web_Mainz_MidLight.png differ diff --git a/data/images/blank.gif b/data/images/blank.gif new file mode 100644 index 000000000..e565824aa Binary files /dev/null and b/data/images/blank.gif differ diff --git a/data/images/crosshairs.png b/data/images/crosshairs.png new file mode 100644 index 000000000..17abeb7a7 Binary files /dev/null and b/data/images/crosshairs.png differ diff --git a/data/images/favicon.ico b/data/images/favicon.ico new file mode 100644 index 000000000..489d0a822 Binary files /dev/null and b/data/images/favicon.ico differ diff --git a/data/images/favicon2.ico b/data/images/favicon2.ico new file mode 100644 index 000000000..49baa2eca Binary files /dev/null and b/data/images/favicon2.ico differ diff --git a/data/images/gramps-geo-altmap.png b/data/images/gramps-geo-altmap.png new file mode 100644 index 000000000..48b3a3238 Binary files /dev/null and b/data/images/gramps-geo-altmap.png differ diff --git a/data/images/gramps-geo-birth.png b/data/images/gramps-geo-birth.png new file mode 100644 index 000000000..a26d9d85f Binary files /dev/null and b/data/images/gramps-geo-birth.png differ diff --git a/data/images/gramps-geo-death.png b/data/images/gramps-geo-death.png new file mode 100644 index 000000000..ab6263f1b Binary files /dev/null and b/data/images/gramps-geo-death.png differ diff --git a/data/images/gramps-geo-mainmap.png b/data/images/gramps-geo-mainmap.png new file mode 100644 index 000000000..7b3575c74 Binary files /dev/null and b/data/images/gramps-geo-mainmap.png differ diff --git a/data/images/gramps-geo-marriage.png b/data/images/gramps-geo-marriage.png new file mode 100644 index 000000000..ed1115431 Binary files /dev/null and b/data/images/gramps-geo-marriage.png differ diff --git a/data/images/somerights20.gif b/data/images/somerights20.gif new file mode 100644 index 000000000..c6b2c898a Binary files /dev/null and b/data/images/somerights20.gif differ diff --git a/gramps/plugins/webstuff/jhtmlarea/AutoPostTest.aspx b/data/jhtmlarea/AutoPostTest.aspx similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/AutoPostTest.aspx rename to data/jhtmlarea/AutoPostTest.aspx diff --git a/gramps/plugins/webstuff/jhtmlarea/AutoPostTest.aspx.vb b/data/jhtmlarea/AutoPostTest.aspx.vb similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/AutoPostTest.aspx.vb rename to data/jhtmlarea/AutoPostTest.aspx.vb diff --git a/gramps/plugins/webstuff/jhtmlarea/ColorPickerMenu.htm b/data/jhtmlarea/ColorPickerMenu.htm similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/ColorPickerMenu.htm rename to data/jhtmlarea/ColorPickerMenu.htm diff --git a/gramps/plugins/webstuff/jhtmlarea/Default.htm b/data/jhtmlarea/Default.htm similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/Default.htm rename to data/jhtmlarea/Default.htm diff --git a/gramps/plugins/webstuff/jhtmlarea/Readme.txt b/data/jhtmlarea/Readme.txt similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/Readme.txt rename to data/jhtmlarea/Readme.txt diff --git a/gramps/plugins/webstuff/jhtmlarea/images/disk.png b/data/jhtmlarea/images/disk.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/images/disk.png rename to data/jhtmlarea/images/disk.png diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0-vsdoc.js b/data/jhtmlarea/scripts/jHtmlArea-0.7.0-vsdoc.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0-vsdoc.js rename to data/jhtmlarea/scripts/jHtmlArea-0.7.0-vsdoc.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0.js b/data/jhtmlarea/scripts/jHtmlArea-0.7.0.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0.js rename to data/jhtmlarea/scripts/jHtmlArea-0.7.0.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0.min-vsdoc.js b/data/jhtmlarea/scripts/jHtmlArea-0.7.0.min-vsdoc.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0.min-vsdoc.js rename to data/jhtmlarea/scripts/jHtmlArea-0.7.0.min-vsdoc.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0.min.js b/data/jhtmlarea/scripts/jHtmlArea-0.7.0.min.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea-0.7.0.min.js rename to data/jhtmlarea/scripts/jHtmlArea-0.7.0.min.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.js b/data/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.js rename to data/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.min.js b/data/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.min.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.min.js rename to data/jhtmlarea/scripts/jHtmlArea.ColorPickerMenu-0.7.0.min.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2-vsdoc.js b/data/jhtmlarea/scripts/jquery-1.3.2-vsdoc.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2-vsdoc.js rename to data/jhtmlarea/scripts/jquery-1.3.2-vsdoc.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2.js b/data/jhtmlarea/scripts/jquery-1.3.2.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2.js rename to data/jhtmlarea/scripts/jquery-1.3.2.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2.min-vsdoc.js b/data/jhtmlarea/scripts/jquery-1.3.2.min-vsdoc.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2.min-vsdoc.js rename to data/jhtmlarea/scripts/jquery-1.3.2.min-vsdoc.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2.min.js b/data/jhtmlarea/scripts/jquery-1.3.2.min.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jquery-1.3.2.min.js rename to data/jhtmlarea/scripts/jquery-1.3.2.min.js diff --git a/gramps/plugins/webstuff/jhtmlarea/scripts/jquery-ui-1.7.2.custom.min.js b/data/jhtmlarea/scripts/jquery-ui-1.7.2.custom.min.js similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/scripts/jquery-ui-1.7.2.custom.min.js rename to data/jhtmlarea/scripts/jquery-ui-1.7.2.custom.min.js diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.ColorPickerMenu.css b/data/jhtmlarea/style/jHtmlArea.ColorPickerMenu.css similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.ColorPickerMenu.css rename to data/jhtmlarea/style/jHtmlArea.ColorPickerMenu.css diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.Editor.css b/data/jhtmlarea/style/jHtmlArea.Editor.css similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.Editor.css rename to data/jhtmlarea/style/jHtmlArea.Editor.css diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.css b/data/jhtmlarea/style/jHtmlArea.css similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.css rename to data/jhtmlarea/style/jHtmlArea.css diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.png b/data/jhtmlarea/style/jHtmlArea.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea.png rename to data/jhtmlarea/style/jHtmlArea.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea_Toolbar_Group_BG.png b/data/jhtmlarea/style/jHtmlArea_Toolbar_Group_BG.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea_Toolbar_Group_BG.png rename to data/jhtmlarea/style/jHtmlArea_Toolbar_Group_BG.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea_Toolbar_Group__Btn_Select_BG.png b/data/jhtmlarea/style/jHtmlArea_Toolbar_Group__Btn_Select_BG.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jHtmlArea_Toolbar_Group__Btn_Select_BG.png rename to data/jhtmlarea/style/jHtmlArea_Toolbar_Group__Btn_Select_BG.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_18_b81900_40x40.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_diagonals-thick_20_666666_40x40.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_flat_10_000000_40x100.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_f6f6f6_1x400.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_100_fdf5ce_1x400.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_glass_65_ffffff_1x400.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_gloss-wave_35_f6a828_500x100.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_100_eeeeee_1x100.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-bg_highlight-soft_75_ffe45c_1x100.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_222222_256x240.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_222222_256x240.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_222222_256x240.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_222222_256x240.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_228ef1_256x240.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_228ef1_256x240.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_228ef1_256x240.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_228ef1_256x240.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ef8c08_256x240.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ef8c08_256x240.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ef8c08_256x240.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ef8c08_256x240.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffd27a_256x240.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffd27a_256x240.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffd27a_256x240.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffd27a_256x240.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffffff_256x240.png b/data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffffff_256x240.png similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffffff_256x240.png rename to data/jhtmlarea/style/jqueryui/ui-lightness/images/ui-icons_ffffff_256x240.png diff --git a/gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/jquery-ui-1.7.2.custom.css b/data/jhtmlarea/style/jqueryui/ui-lightness/jquery-ui-1.7.2.custom.css similarity index 100% rename from gramps/plugins/webstuff/jhtmlarea/style/jqueryui/ui-lightness/jquery-ui-1.7.2.custom.css rename to data/jhtmlarea/style/jqueryui/ui-lightness/jquery-ui-1.7.2.custom.css diff --git a/data/templates/admin/base_site.html b/data/templates/admin/base_site.html index d31a0fd82..aae7ba20c 100644 --- a/data/templates/admin/base_site.html +++ b/data/templates/admin/base_site.html @@ -1,10 +1,10 @@ {% extends "admin/base.html" %} {% load i18n %} -{% block title %}{{ title }} | My New Title{% endblock %} +{% block title %}{{ title }} | Adminstration{% endblock %} {% block branding %} -

My new title for the Admin site!

+

Administration

{% endblock %} {% block nav-global %} @@ -13,9 +13,8 @@ .ml {margin:0 10px 10px;display:block;float:left} - Website home - Admin home - Invoices + Home + Administration home New Users All Users {% endif %} diff --git a/gramps/webapp/grampsdb/profile.py b/gramps/webapp/grampsdb/profile.py index 7bbcc3947..cb824bae2 100644 --- a/gramps/webapp/grampsdb/profile.py +++ b/gramps/webapp/grampsdb/profile.py @@ -25,6 +25,14 @@ from django.contrib.auth.models import User from gramps.gen.constfunc import cuni +def save_profile(sender, instance, created, **kwargs): + """ + Creates the profile when the user gets created. + """ + if created: + profile = Profile(user=instance) + profile.save() + class Profile(models.Model): """ Used to save additional information of a user, such as @@ -36,12 +44,4 @@ class Profile(models.Model): def __unicode__(self): return cuni(self.user) -def save_profile(sender, instance, created, **kwargs): - """ - Creates the profile when the user gets created. - """ - if created: - profile = Profile(user=instance) - profile.save() - post_save.connect(save_profile, sender=User) diff --git a/gramps/webapp/settings.py b/gramps/webapp/settings.py index d3821aae3..55cee79d2 100644 --- a/gramps/webapp/settings.py +++ b/gramps/webapp/settings.py @@ -23,8 +23,10 @@ # Need to be able to import Gramps files from here. -from gramps.gen.const import DATA_DIR, WEB_DIR import os +os.environ['GRAMPS_RESOURCES'] = os.path.dirname(os.path.abspath("..")) + +from gramps.gen.const import DATA_DIR, WEB_DIR DEBUG = True TEMPLATE_DEBUG = DEBUG diff --git a/gramps/webapp/shell.py b/gramps/webapp/shell.py index b5f9f39e0..1d941dc33 100644 --- a/gramps/webapp/shell.py +++ b/gramps/webapp/shell.py @@ -26,6 +26,7 @@ #### >>> Person.objects.all() import os +os.environ['GRAMPS_RESOURCES'] = os.path.dirname(os.path.abspath("..")) pystartup = os.path.expanduser("~/.pystartup") if os.path.exists(pystartup): execfile(pystartup) diff --git a/gramps/webapp/urls.py b/gramps/webapp/urls.py index c9adbe0e2..a46587d0d 100644 --- a/gramps/webapp/urls.py +++ b/gramps/webapp/urls.py @@ -33,7 +33,7 @@ import os # Django and Gramps Modules # #------------------------------------------------------------------------ -from gramps.gen.const import IMAGE_DIR, ROOT_DIR +from gramps.gen.const import IMAGE_DIR, ROOT_DIR, DATA_DIR from django.conf.urls.defaults import * from django.contrib import admin @@ -49,12 +49,12 @@ urlpatterns = patterns('', urlpatterns += patterns('', # Static serves! DANGEROUS in production: (r'^styles/(?P.*)$', 'django.views.static.serve', - {'document_root': - os.path.join(ROOT_DIR, "plugins", "webstuff"), + {'document_root': DATA_DIR, +# os.path.join(ROOT_DIR, "plugins", "webstuff"), 'show_indexes': True}, ), (r'^images/(?P.*)$', 'django.views.static.serve', - {'document_root': IMAGE_DIR, + {'document_root': IMAGE_DIR, 'show_indexes': True}, ), ) @@ -94,6 +94,7 @@ urlpatterns += patterns('', (r'^person/(?P(\w+))/name/(?P(\w+))/surname/(?P(\w+))/(?P(\w+))$', process_surname), (r'^family/(?P(\w+))/(?P(\w+))/child/(?P(\w+))$', process_child), +## (r'^profile/(?P(\w+)/)$', ), (r'^(?P(\w+))/(?P(\w+))/(?P(\w+))/(?P(\w+))/(?P(\w+))$', process_list_item), (r'^note/(?P(\w+))/person/(?P(\w+))/name/(?P(\w+))$',