diff --git a/greenhouse/.dotcloud/config b/greenhouse-project/.dotcloud/config similarity index 100% rename from greenhouse/.dotcloud/config rename to greenhouse-project/.dotcloud/config diff --git a/greenhouse/debian-emails b/greenhouse-project/debian-emails similarity index 100% rename from greenhouse/debian-emails rename to greenhouse-project/debian-emails diff --git a/greenhouse/greenhouse/__init__.py b/greenhouse-project/greenhouse-project-settings/__init__.py similarity index 100% rename from greenhouse/greenhouse/__init__.py rename to greenhouse-project/greenhouse-project-settings/__init__.py diff --git a/greenhouse/greenhouse/local_settings.py.sample b/greenhouse-project/greenhouse-project-settings/local_settings.py.sample similarity index 100% rename from greenhouse/greenhouse/local_settings.py.sample rename to greenhouse-project/greenhouse-project-settings/local_settings.py.sample diff --git a/greenhouse/greenhouse/settings.py b/greenhouse-project/greenhouse-project-settings/settings.py similarity index 98% rename from greenhouse/greenhouse/settings.py rename to greenhouse-project/greenhouse-project-settings/settings.py index 809ce4e..846a719 100644 --- a/greenhouse/greenhouse/settings.py +++ b/greenhouse-project/greenhouse-project-settings/settings.py @@ -100,10 +100,10 @@ # 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) -ROOT_URLCONF = 'greenhouse.urls' +ROOT_URLCONF = 'greenhouse-project-settings.urls' # Python dotted path to the WSGI application used by Django's runserver. -WSGI_APPLICATION = 'greenhouse.wsgi.application' +WSGI_APPLICATION = 'greenhouse-project-settings.wsgi.application' TEMPLATE_DIRS = ( # Put strings here, like "/home/html/django_templates" diff --git a/greenhouse/greenhouse/urls.py b/greenhouse-project/greenhouse-project-settings/urls.py similarity index 100% rename from greenhouse/greenhouse/urls.py rename to greenhouse-project/greenhouse-project-settings/urls.py diff --git a/greenhouse/greenhouse/wsgi.py b/greenhouse-project/greenhouse-project-settings/wsgi.py similarity index 93% rename from greenhouse/greenhouse/wsgi.py rename to greenhouse-project/greenhouse-project-settings/wsgi.py index 7fc5250..95a3eba 100644 --- a/greenhouse/greenhouse/wsgi.py +++ b/greenhouse-project/greenhouse-project-settings/wsgi.py @@ -15,7 +15,7 @@ """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse.settings") +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse-project.settings") # This application object is used by any WSGI server configured to use this # file. This includes Django's development server, if the WSGI_APPLICATION diff --git a/greenhouse/manage.py~ b/greenhouse-project/manage.py similarity index 89% rename from greenhouse/manage.py~ rename to greenhouse-project/manage.py index a82fd87..5ea5505 100644 --- a/greenhouse/manage.py~ +++ b/greenhouse-project/manage.py @@ -3,7 +3,7 @@ import sys if __name__ == "__main__": - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse-config.settings") + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "greenhouse-project-settings.settings") from django.core.management import execute_from_command_line diff --git a/greenhouse/static/css/background-dotted.png b/greenhouse-project/static/css/background-dotted.png similarity index 100% rename from greenhouse/static/css/background-dotted.png rename to greenhouse-project/static/css/background-dotted.png diff --git a/greenhouse/static/css/base.css b/greenhouse-project/static/css/base.css similarity index 100% rename from greenhouse/static/css/base.css rename to greenhouse-project/static/css/base.css diff --git a/greenhouse/static/css/bootstrap.css b/greenhouse-project/static/css/bootstrap.css similarity index 100% rename from greenhouse/static/css/bootstrap.css rename to greenhouse-project/static/css/bootstrap.css diff --git a/greenhouse/static/css/orangeheader-stripes.png b/greenhouse-project/static/css/orangeheader-stripes.png similarity index 100% rename from greenhouse/static/css/orangeheader-stripes.png rename to greenhouse-project/static/css/orangeheader-stripes.png diff --git a/greenhouse/static/img/edit.png b/greenhouse-project/static/img/edit.png similarity index 100% rename from greenhouse/static/img/edit.png rename to greenhouse-project/static/img/edit.png diff --git a/greenhouse/static/img/favicon.ico b/greenhouse-project/static/img/favicon.ico similarity index 100% rename from greenhouse/static/img/favicon.ico rename to greenhouse-project/static/img/favicon.ico diff --git a/greenhouse/static/js/dat-overview.js b/greenhouse-project/static/js/dat-overview.js similarity index 100% rename from greenhouse/static/js/dat-overview.js rename to greenhouse-project/static/js/dat-overview.js diff --git a/greenhouse/templates/404.html b/greenhouse-project/templates/404.html similarity index 100% rename from greenhouse/templates/404.html rename to greenhouse-project/templates/404.html diff --git a/greenhouse/templates/500.html b/greenhouse-project/templates/500.html similarity index 100% rename from greenhouse/templates/500.html rename to greenhouse-project/templates/500.html diff --git a/greenhouse/templates/base.html b/greenhouse-project/templates/base.html similarity index 76% rename from greenhouse/templates/base.html rename to greenhouse-project/templates/base.html index 1e9cec4..a4d933b 100644 --- a/greenhouse/templates/base.html +++ b/greenhouse-project/templates/base.html @@ -6,7 +6,7 @@ - {% block title %}{% trans "Greenhouse Overview" %}{% endblock %} + {% block title %}{% trans "Greenhouse" %}{% endblock %} @@ -25,18 +25,10 @@
@@ -83,19 +71,11 @@ - +
- - diff --git a/greenhouse/templates/dashboard.html b/greenhouse-project/templates/dashboard.html similarity index 50% rename from greenhouse/templates/dashboard.html rename to greenhouse-project/templates/dashboard.html index e3cc8be..9b7118d 100644 --- a/greenhouse/templates/dashboard.html +++ b/greenhouse-project/templates/dashboard.html @@ -1,38 +1,49 @@ {% load custom_tags %} {% block dashboard %} -

Dashboard:

+

The purpose of this app is to help Debian Developer Advisory Team get in touch with new Debian contributors. +People who should get pinged are active contributors who become inactive as well as experienced people who should +be applying for developer status. +

-

New comers not greeted yet:

- {% for p in first_timers|dictsortreversed:"first_upload.timestamp" %}
  • {{ p.name }}, {{ p.first_upload.timestamp|date:"SHORT_DATE_FORMAT" }}
    • {% endfor %} -
    -

    Have done 40 uploads but need to be contacted:

    - {% for p in experienced|dictsortreversed:"last_upload.timestamp" %}
  • {{ p.name }}, {{ p.total_uploads }} uploads
    • {% endfor %} -
    -

    Haven't done an upload since being contacted:

    - {% for p in inactive|dictsortreversed:"last_upload.timestamp" %} -
  • {{ p.name }} {% ubu_dev_img p.ubuntu_dev %}, {{ p.last_upload.timestamp|date:"SHORT_DATE_FORMAT" }}
    • +
  • {{ p.name }}, {{ p.last_upload.timestamp|date:"SHORT_DATE_FORMAT" }}
    • + {% endfor %} +
    + +
    +

    Was recently contacted:

    + {% for p in contacted %} +
  • {{ p.name }}, {{ p.last_upload.timestamp|date:"SHORT_DATE_FORMAT" }}
    • {% endfor %} +
    +
    +

    Your Most Recent Actions:

    +
    {% endblock %} diff --git a/greenhouse/templates/edit_person.html b/greenhouse-project/templates/edit_person.html similarity index 100% rename from greenhouse/templates/edit_person.html rename to greenhouse-project/templates/edit_person.html diff --git a/greenhouse/templates/index.html b/greenhouse-project/templates/index.html similarity index 77% rename from greenhouse/templates/index.html rename to greenhouse-project/templates/index.html index 1da77aa..2951072 100644 --- a/greenhouse/templates/index.html +++ b/greenhouse-project/templates/index.html @@ -2,14 +2,6 @@ {% load custom_tags %} {% block content %} - -

    Welcome to Greenhouse

    -

    The purpose of this app is to help Debian Developers get in touch with new Debian contributors. People who should -get pinged are active contributors who become inactive as well as experienced people who should be applying for -developer status. -

    -
    -
    {% if not in_allowed_group %} diff --git a/greenhouse/templates/person.html b/greenhouse-project/templates/person.html similarity index 91% rename from greenhouse/templates/person.html rename to greenhouse-project/templates/person.html index afce140..36e2d1e 100644 --- a/greenhouse/templates/person.html +++ b/greenhouse-project/templates/person.html @@ -51,6 +51,7 @@

    {{ person.name }}

    {{ suggestion|safe }}

    | [unify duplicate identity] +
  • DDPO: {{person.name}}
  • Debian Developer: {{ person.ubuntu_dev|yesno:"Yes,No" }}
  • Last Seen: {{ person.last_upload.timestamp }}
  • Last Contact: {{ person|recent_contact }}
    • @@ -82,6 +83,25 @@

    {{ person.name }}

    {{ suggestion|safe }}

    +
    +

    Most recent uploads:

    + + + + + + + + {% for ul in recent_uploads %} + + + + + + {% endfor %} +
    PackageVersionDate
    {{ ul.package }}{{ ul.version }}{{ ul.timestamp }}
    +
    +

    Whiteboard:

    @@ -137,30 +157,13 @@

    #{{ forloop.revcounter }}

    Uploads per release:

    - -
    -

    Most recent uploads:

    - - - - - - - - {% for ul in recent_uploads %} - - - - - {% endfor %} -
    PackageVersionDate
    {{ ul.package }}{{ ul.version }} - {{ ul.timestamp }}
    -