diff --git a/.gitignore b/.gitignore index 692432b2..87fb20d6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ *.pyc *.egg-info -youmap/settings/local.py -youmap/settings/local/* +umap/settings/local.py +umap/settings/local/* docs/_build diff --git a/README.rst b/README.rst index 0018af22..b93028dc 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,9 @@ -YouMap project +uMap project ============== About ----- -YouMap let you create map with OpenStreetMap layers in a minute and embed them in your site. +uMap let you create map with OpenStreetMap layers in a minute and embed them in your site. *Be cause we think that the more OSM will be used, the more OSM will be ''cured''.* It uses `django-leaflet-storage `_ and `Leaflet.Storage `_, built on top of Django and Leaflet. @@ -15,24 +15,24 @@ Create a geo aware database. See `Geodjango doc ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - -rm -rf _build/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) _build/html - @echo - @echo "Build finished. The HTML pages are in _build/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) _build/dirhtml - @echo - @echo "Build finished. The HTML pages are in _build/dirhtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) _build/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) _build/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) _build/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in _build/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) _build/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in _build/qthelp, like this:" - @echo "# qcollectiongenerator _build/qthelp/project.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile _build/qthelp/project.qhc" - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) _build/latex - @echo - @echo "Build finished; the LaTeX files are in _build/latex." - @echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \ - "run these through (pdf)latex." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) _build/changes - @echo - @echo "The overview file is in _build/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) _build/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in _build/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) _build/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in _build/doctest/output.txt." diff --git a/docs/conf.py b/docs/conf.py deleted file mode 100644 index c2286a71..00000000 --- a/docs/conf.py +++ /dev/null @@ -1,195 +0,0 @@ -# -*- coding: utf-8 -*- -# -# youmap documentation build configuration file, created by -# sphinx-quickstart on Wed Aug 19 10:27:46 2009. -# -# This file is execfile()d with the current directory set to its containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys, os -import datetime - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.append(os.path.abspath('.')) - -# -- General configuration ----------------------------------------------------- - -# Add any Sphinx extension module names here, as strings. They can be extensions -# coming with Sphinx (named 'sphinx.ext.*') or your custom ones. -extensions = ['sphinx.ext.autodoc'] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix of source filenames. -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'youmap' -copyright = u'%d, myauthor' % datetime.date.today().year - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = '1.0' -# The full version, including alpha/beta/rc tags. -release = '1.0' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -#language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of documents that shouldn't be included in the build. -#unused_docs = [] - -# List of directories, relative to source directory, that shouldn't be searched -# for source files. -exclude_trees = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - - -# -- Options for HTML output --------------------------------------------------- - -# The theme to use for HTML and HTML Help pages. Major themes that come with -# Sphinx are currently 'default' and 'sphinxdoc'. -html_theme = 'default' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_use_modindex = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# If nonempty, this is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = '' - -# Output file base name for HTML help builder. -htmlhelp_basename = 'youmapdoc' - - -# -- Options for LaTeX output -------------------------------------------------- - -# The paper size ('letter' or 'a4'). -#latex_paper_size = 'letter' - -# The font size ('10pt', '11pt' or '12pt'). -#latex_font_size = '10pt' - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, author, documentclass [howto/manual]). -latex_documents = [ - ('index', 'youmap.tex', u'youmap Documentation', - u'myauthor', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# Additional stuff for the LaTeX preamble. -#latex_preamble = '' - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_use_modindex = True diff --git a/docs/deployment.rst b/docs/deployment.rst deleted file mode 100644 index 34e39eb9..00000000 --- a/docs/deployment.rst +++ /dev/null @@ -1,28 +0,0 @@ -Deployment -========== - -Staging/Development -------------------- - -`Fabric `_ is used to allow developers to -easily push changes to a previously setup development/staging environment. -To get started, install Fabric by running the following command from within -your virtual environment:: - - pip install fabric==1.4 - -So see a list of available commands, run the following command from within your -project directory:: - - fab -l - -Some common commands:: - - fab restart # Restart the web server. - fab update # Just update the repository. - fab push deploy # Push, then fully deploy. - -From the within the project directory, you can just run ``fab [command]``. -If you want to run fabric outside of the directory, use:: - - fab --fabfile /path/to/project/fabfile.py [command] diff --git a/docs/environments.rst b/docs/environments.rst deleted file mode 100644 index b702cd37..00000000 --- a/docs/environments.rst +++ /dev/null @@ -1,17 +0,0 @@ -================== -Environments -================== - -When deploying to multiple environments (development, staging, production, etc.), you'll likely want to deploy different configurations. Each environment/configuration should have its own file in ``youmap/settings`` and inherit from ``youmap.settings.base``. A ``dev`` environment is provided as an example. - -By default, ``manage.py`` and ``wsgi.py`` will use ``youmap.settings.local`` if no settings module has been defined. To override this, use the standard Django constructs (setting the ``DJANGO_SETTINGS_MODULE`` environment variable or passing in ``--settings=youmap.settings.``). Alternatively, you can symlink your environment's settings to ``youmap/settings/local.py``. - -You may want to have different ``wsgi.py`` and ``urls.py`` files for different environments as well. If so, simply follow the directory structure laid out by ``youmap/settings``, for example:: - - wsgi/ - __init__.py - base.py - dev.py - ... - -The settings files have examples of how to point Django to these specific environments. \ No newline at end of file diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index 4304d61a..00000000 --- a/docs/index.rst +++ /dev/null @@ -1,19 +0,0 @@ -Welcome to youmap's documentation! -===================================== - -Contents: - -.. toctree:: - :maxdepth: 2 - - install - environments - deployment - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` - diff --git a/docs/install.rst b/docs/install.rst deleted file mode 100644 index 45c4d857..00000000 --- a/docs/install.rst +++ /dev/null @@ -1,57 +0,0 @@ -================== -Installation -================== - -Pre-Requisites -=============== - -* `setuptools `_ -* `virtualenv `_ - -To install all of these system dependencies on a Debian-based system, run:: - - sudo apt-get install python-setuptools - sudo easy_install virtualenv - - -Creating the Virtual Environment -================================ - -First, create a clean base environment using virtualenv:: - - virtualenv youmap - cd youmap - source bin/activate - - -Installing the Project -====================== - -Install the requirements and the project source:: - - cd path/to/your/youmap/repository - pip install -r requirements.pip - pip install -e . - - -Configuring a Local Environment -=============================== - -If you're just checking the project out locally, you can copy some example -configuration files to get started quickly:: - - cp youmap/settings/local.py.example youmap/settings/local.py - manage.py syncdb --migrate - - -Building Documentation -====================== - -Documentation is available in ``docs`` and can be built into a number of -formats using `Sphinx `_. To get started:: - - pip install Sphinx - cd docs - make html - -This creates the documentation in HTML format at ``docs/_build/html``. diff --git a/fabfile.py b/fabfile.py index d1ae5e17..c0c55e75 100644 --- a/fabfile.py +++ b/fabfile.py @@ -3,8 +3,8 @@ from fabric.api import task, env, run, local, roles, cd, execute, hide, puts,\ import posixpath -env.project_name = 'youmap' -env.repository = 'https://yohanboniface@bitbucket.org/yohanboniface/youmap_project.git' +env.project_name = 'umap' +env.repository = 'https://yohanboniface@bitbucket.org/yohanboniface/umap.git' env.local_branch = 'master' env.remote_ref = 'origin/master' env.requirements_file = 'requirements.pip' @@ -20,7 +20,7 @@ def live(): """ Use the live deployment environment. """ - server = 'youmap.org' + server = 'umap.org' env.roledefs = { 'web': [server], 'db': [server], diff --git a/manage.py b/manage.py index c30bedc8..ed1ac4cb 100644 --- a/manage.py +++ b/manage.py @@ -4,7 +4,7 @@ import sys if __name__ == "__main__": os.environ.setdefault("DJANGO_SETTINGS_MODULE", - "youmap.settings.local") + "umap.settings.local") from django.core.management import execute_from_command_line diff --git a/setup.py b/setup.py index c4c0a883..923e82c2 100644 --- a/setup.py +++ b/setup.py @@ -5,19 +5,19 @@ import codecs from setuptools import setup, find_packages -import youmap +import umap long_description = codecs.open('README.rst', "r", "utf-8").read() setup( - name="youmap", - version=youmap.__version__, - author=youmap.__author__, - author_email=youmap.__contact__, - description=youmap.__doc__, + name="umap", + version=umap.__version__, + author=umap.__author__, + author_email=umap.__contact__, + description=umap.__doc__, keywords="django leaflet geodjango openstreetmap", - url=youmap.__homepage__, - download_url="https://bitbucket.org/yohanboniface/youmap_project/downloads", + url=umap.__homepage__, + download_url="https://bitbucket.org/yohanboniface/umap/downloads", packages=find_packages(), include_package_data=True, platforms=["any"], diff --git a/youmap/__init__.py b/umap/__init__.py similarity index 67% rename from youmap/__init__.py rename to umap/__init__.py index 253bd978..c181751b 100644 --- a/youmap/__init__.py +++ b/umap/__init__.py @@ -1,7 +1,7 @@ "Create maps with OpenStreetMap layers in a minute and embed them in your site." -VERSION = (0, 0, 1) +VERSION = (0, 0, 8) __author__ = 'Yohan Boniface' __contact__ = "yb@enix.org" -__homepage__ = "https://bitbucket.org/yohanboniface/youmap_project" +__homepage__ = "https://bitbucket.org/yohanboniface/umap" __version__ = ".".join(map(str, VERSION)) diff --git a/youmap/apps/__init__.py b/umap/apps/__init__.py similarity index 100% rename from youmap/apps/__init__.py rename to umap/apps/__init__.py diff --git a/youmap/locale/fr/LC_MESSAGES/django.mo b/umap/locale/fr/LC_MESSAGES/django.mo similarity index 100% rename from youmap/locale/fr/LC_MESSAGES/django.mo rename to umap/locale/fr/LC_MESSAGES/django.mo diff --git a/youmap/locale/fr/LC_MESSAGES/django.po b/umap/locale/fr/LC_MESSAGES/django.po similarity index 100% rename from youmap/locale/fr/LC_MESSAGES/django.po rename to umap/locale/fr/LC_MESSAGES/django.po diff --git a/youmap/sesql_config.py b/umap/sesql_config.py similarity index 100% rename from youmap/sesql_config.py rename to umap/sesql_config.py diff --git a/youmap/settings/__init__.py b/umap/settings/__init__.py similarity index 100% rename from youmap/settings/__init__.py rename to umap/settings/__init__.py diff --git a/youmap/settings/base.py b/umap/settings/base.py similarity index 98% rename from youmap/settings/base.py rename to umap/settings/base.py index 29b07fc4..a38589df 100644 --- a/youmap/settings/base.py +++ b/umap/settings/base.py @@ -31,7 +31,7 @@ INSTALLED_APPS = ( 'leaflet_storage', 'foundation', 'endless_pagination', - 'youmap', + 'umap', 'sesql', 'compressor', @@ -54,7 +54,7 @@ INSTALLED_APPS = ( import os import sys -import youmap as project_module +import umap as project_module PROJECT_DIR = os.path.dirname(os.path.realpath(project_module.__file__)) @@ -81,7 +81,7 @@ if not os.path.exists(VAR_ROOT): # Project URLS and media settings #============================================================================== -ROOT_URLCONF = 'youmap.urls' +ROOT_URLCONF = 'umap.urls' LOGIN_URL = '/login/' LOGOUT_URL = '/logout/' diff --git a/youmap/settings/dev.py b/umap/settings/dev.py similarity index 53% rename from youmap/settings/dev.py rename to umap/settings/dev.py index a8556485..9439e43b 100644 --- a/youmap/settings/dev.py +++ b/umap/settings/dev.py @@ -1,20 +1,16 @@ """Settings for Development Server""" -from youmap.settings.base import * # pylint: disable=W0614,W0401 +from umap.settings.base import * # pylint: disable=W0614,W0401 DEBUG = True TEMPLATE_DEBUG = DEBUG -VAR_ROOT = '/var/www/youmap' +VAR_ROOT = '/var/www/umap' MEDIA_ROOT = os.path.join(VAR_ROOT, 'uploads') STATIC_ROOT = os.path.join(VAR_ROOT, 'static') DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'youmap', -# 'USER': 'dbuser', -# 'PASSWORD': 'dbpassword', + 'NAME': 'umap', } } - -# WSGI_APPLICATION = 'youmap.wsgi.dev.application' diff --git a/youmap/static/.gitignore b/umap/static/.gitignore similarity index 100% rename from youmap/static/.gitignore rename to umap/static/.gitignore diff --git a/youmap/static/youmap/youmap.css b/umap/static/umap/umap.css similarity index 100% rename from youmap/static/youmap/youmap.css rename to umap/static/umap/umap.css diff --git a/youmap/templates/404.html b/umap/templates/404.html similarity index 100% rename from youmap/templates/404.html rename to umap/templates/404.html diff --git a/youmap/templates/500.html b/umap/templates/500.html similarity index 100% rename from youmap/templates/500.html rename to umap/templates/500.html diff --git a/youmap/templates/auth/user_detail.html b/umap/templates/auth/user_detail.html similarity index 89% rename from youmap/templates/auth/user_detail.html rename to umap/templates/auth/user_detail.html index d402a2ea..d4915d56 100644 --- a/youmap/templates/auth/user_detail.html +++ b/umap/templates/auth/user_detail.html @@ -1,4 +1,4 @@ -{% extends "youmap/home.html" %} +{% extends "umap/home.html" %} {% block content %}
@@ -6,7 +6,7 @@ - {% include 'youmap/navigation.html' %} + {% include 'umap/navigation.html' %}
diff --git a/youmap/templates/base.html b/umap/templates/base.html similarity index 97% rename from youmap/templates/base.html rename to umap/templates/base.html index 542a3971..f46ebd90 100644 --- a/youmap/templates/base.html +++ b/umap/templates/base.html @@ -7,7 +7,7 @@ {% compress css %} - + {% endcompress css %} diff --git a/youmap/templates/leaflet_storage/category_form.html b/umap/templates/leaflet_storage/category_form.html similarity index 97% rename from youmap/templates/leaflet_storage/category_form.html rename to umap/templates/leaflet_storage/category_form.html index 0aa66bf2..c1915a60 100644 --- a/youmap/templates/leaflet_storage/category_form.html +++ b/umap/templates/leaflet_storage/category_form.html @@ -1,4 +1,4 @@ -{% load youmap_tags i18n %} +{% load umap_tags i18n %}
{% csrf_token %} {% for error in form.errors %} diff --git a/youmap/templates/leaflet_storage/feature_form.html b/umap/templates/leaflet_storage/feature_form.html similarity index 94% rename from youmap/templates/leaflet_storage/feature_form.html rename to umap/templates/leaflet_storage/feature_form.html index d6bf4c82..f1f97f7e 100644 --- a/youmap/templates/leaflet_storage/feature_form.html +++ b/umap/templates/leaflet_storage/feature_form.html @@ -1,4 +1,4 @@ -{% load youmap_tags i18n %} +{% load umap_tags i18n %} {% csrf_token %} {{ form.no_field_errors }} diff --git a/youmap/templates/leaflet_storage/map_detail.html b/umap/templates/leaflet_storage/map_detail.html similarity index 100% rename from youmap/templates/leaflet_storage/map_detail.html rename to umap/templates/leaflet_storage/map_detail.html diff --git a/youmap/templates/leaflet_storage/map_form.html b/umap/templates/leaflet_storage/map_form.html similarity index 95% rename from youmap/templates/leaflet_storage/map_form.html rename to umap/templates/leaflet_storage/map_form.html index 4bcff5c3..3500d17b 100644 --- a/youmap/templates/leaflet_storage/map_form.html +++ b/umap/templates/leaflet_storage/map_form.html @@ -1,4 +1,4 @@ -{% load youmap_tags i18n %} +{% load umap_tags i18n %} {% if not map %}

{% trans "Create your map now!" %}

{% endif %} diff --git a/youmap/templates/leaflet_storage/map_list.html b/umap/templates/leaflet_storage/map_list.html similarity index 100% rename from youmap/templates/leaflet_storage/map_list.html rename to umap/templates/leaflet_storage/map_list.html diff --git a/youmap/templates/leaflet_storage/map_update_tilelayers.html b/umap/templates/leaflet_storage/map_update_tilelayers.html similarity index 100% rename from youmap/templates/leaflet_storage/map_update_tilelayers.html rename to umap/templates/leaflet_storage/map_update_tilelayers.html diff --git a/youmap/templates/youmap/field.html b/umap/templates/umap/field.html similarity index 100% rename from youmap/templates/youmap/field.html rename to umap/templates/umap/field.html diff --git a/youmap/templates/youmap/home.html b/umap/templates/umap/home.html similarity index 94% rename from youmap/templates/youmap/home.html rename to umap/templates/umap/home.html index e9147db6..616e21cc 100644 --- a/youmap/templates/youmap/home.html +++ b/umap/templates/umap/home.html @@ -17,7 +17,7 @@ - {% include 'youmap/navigation.html' %} + {% include 'umap/navigation.html' %} @@ -63,7 +63,7 @@ - +
{% trans "Fork it" %}
@@ -109,7 +109,7 @@
diff --git a/youmap/templates/youmap/navigation.html b/umap/templates/umap/navigation.html similarity index 100% rename from youmap/templates/youmap/navigation.html rename to umap/templates/umap/navigation.html diff --git a/youmap/templates/youmap/search.html b/umap/templates/umap/search.html similarity index 90% rename from youmap/templates/youmap/search.html rename to umap/templates/umap/search.html index 5bfb9854..b609fc77 100644 --- a/youmap/templates/youmap/search.html +++ b/umap/templates/umap/search.html @@ -1,4 +1,4 @@ -{% extends "youmap/home.html" %} +{% extends "umap/home.html" %} {% load i18n %} @@ -8,7 +8,7 @@ - {% include 'youmap/navigation.html' %} + {% include 'umap/navigation.html' %}
diff --git a/youmap/templatetags/__init__.py b/umap/templatetags/__init__.py similarity index 100% rename from youmap/templatetags/__init__.py rename to umap/templatetags/__init__.py diff --git a/youmap/templatetags/youmap_tags.py b/umap/templatetags/umap_tags.py similarity index 74% rename from youmap/templatetags/youmap_tags.py rename to umap/templatetags/umap_tags.py index 38fa66cc..0aea8476 100644 --- a/youmap/templatetags/youmap_tags.py +++ b/umap/templatetags/umap_tags.py @@ -3,7 +3,7 @@ from django import template register = template.Library() -@register.inclusion_tag('youmap/field.html') +@register.inclusion_tag('umap/field.html') def foundation_field(field): return { 'field': field, diff --git a/youmap/urls.py b/umap/urls.py similarity index 95% rename from youmap/urls.py rename to umap/urls.py index e42eb087..e0904510 100644 --- a/youmap/urls.py +++ b/umap/urls.py @@ -10,7 +10,6 @@ from . import views admin.autodiscover() urlpatterns = patterns('', - # (r'', include('youmap.apps.')), (r'^admin/doc/', include('django.contrib.admindocs.urls')), (r'^admin/', include(admin.site.urls)), url(r'^$', views.home, name="home"), diff --git a/youmap/views.py b/umap/views.py similarity index 96% rename from youmap/views.py rename to umap/views.py index 020f0385..517081e2 100644 --- a/youmap/views.py +++ b/umap/views.py @@ -9,7 +9,7 @@ from leaflet_storage.models import Map class Home(TemplateView): - template_name = "youmap/home.html" + template_name = "umap/home.html" list_template_name = "leaflet_storage/map_list.html" def get_context_data(self, **kwargs): @@ -59,7 +59,7 @@ user_maps = UserMaps.as_view() class Search(TemplateView): - template_name = "youmap/search.html" + template_name = "umap/search.html" list_template_name = "leaflet_storage/map_list.html" def get_context_data(self, **kwargs): diff --git a/youmap/wsgi.py b/umap/wsgi.py similarity index 93% rename from youmap/wsgi.py rename to umap/wsgi.py index 861c4dbb..0db32cfa 100644 --- a/youmap/wsgi.py +++ b/umap/wsgi.py @@ -1,5 +1,5 @@ """ -WSGI config for youmap project. +WSGI config for umap project. This module contains the WSGI application used by Django's development server and any production WSGI deployments. It should expose a module-level variable @@ -16,7 +16,7 @@ framework. import os os.environ.setdefault("DJANGO_SETTINGS_MODULE", - "youmap.settings.local") + "umap.settings.local") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION