Destroy links to tracking and gl_tracking apps

vleong2332 · vleong2332 · commit f1f436e09a38 · 2017-02-02T10:31:33.000-05:00
diff --git a/td/settings.py b/td/settings.py
@@ -234,7 +234,6 @@
 EMAIL_FROM = "uwadmin@unfoldingword.org"
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
-# EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 
 ACCOUNT_OPEN_SIGNUP = False
 ACCOUNT_EMAIL_UNIQUE = True
@@ -275,8 +274,3 @@
         "key": os.environ.get("PORT_API_KEY"),
     }
 ]
-
-HOMEPAGE_MESSAGE = "The ability to create and update Languages, WA Regions, Countries, Charters, Events, and Partners " \
-                   "will be suspended for all users starting on Monday, Jan. 9, 2017. These functions will be made " \
-                   "available in the new system, which is launching in a couple of weeks. Please retain the " \
-                   "information you want to enter until then."
diff --git a/td/templates/resources/country_detail.html b/td/templates/resources/country_detail.html
@@ -29,8 +29,6 @@ <h1 class="language-title">{{ country.name }}</h1>
         <li role="presentation" class="active"><a data-toggle="tab" data-target="#general-view">General Info</a></li>
         <li role="presentation"><a data-toggle="tab" data-target="#languages-view">Languages</a></li>
         {% if user.is_authenticated %}
-            <li role="presentation"><a data-toggle="tab" data-target="#projects-view">Projects</a></li>
-            <li role="presentation"><a data-toggle="tab" data-target="#events-view">Events</a></li>
             <li role="presentation"><a data-toggle="tab" data-target="#comments-view">Comments</a></li>
         {% endif %}
     </ul>
@@ -47,11 +45,6 @@ <h1 class="language-title">{{ country.name }}</h1>
                         <tr><th>Hashtag</th><td>{{ country.hashtag|default:"-" }}</td></tr>
                         <tr><th>Population</th><td>{{ country.population|default:"-"|intcomma }}</td></tr>
                         <tr><th>Region</th><td>{{ country.region|default:"-" }}</td></tr>
-                        <tr><th>WA Region</th><td>{{ country.wa_region|default:"-" }}</td></tr>
-                        <!-- Legacy Code -->
-                        {# <div class="col-md-4"> #}
-                            {# include "resources/_short_list.html" with title="Top Networks" data=country.primary_networks.all #}
-                        {# </div> #}
                     </tbody>
                 </table>
             </div>
@@ -66,63 +59,6 @@ <h1 class="language-title">{{ country.name }}</h1>
 
         {% if user.is_authenticated %}
 
-            <!-- PROJECTS VIEW -->
-            <div id="projects-view" class="row tab-pane">
-                <div class="col-md-12">
-                    <table class="table table-borderless" data-source="{% url "tracking:ajax_ds_charter_list" "country" country.pk %}">
-                        <thead>
-                        <tr>
-                            <th>Language</th>
-                            <th>Name</th>
-                            <th>Code</th>
-                            <th>Start Date</th>
-                            <th>End Date</th>
-                            <th>Contact Person</th>
-                            <th>WA Region</th>
-                        </tr>
-                        </thead>
-                        <tbody>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <!-- EVENTS VIEW -->
-            <div id="events-view" class="row tab-pane">
-                <div class="col-md-12">
-
-                    <!-- EVENT LIST -->
-                    <div class="event-list-table-container">
-                        <table class="table table-borderless" data-source="{% url "tracking:ajax_event_list" "country" country.pk %}">
-                            <thead>
-                            <tr>
-                                <th>Native</th>
-                                <th>Anglicized</th>
-                                <th>Number</th>
-                                <th>Location</th>
-                                <th>Start Date</th>
-                                <th>End Date</th>
-                            </tr>
-                            </thead>
-                            <tbody>
-                            </tbody>
-                        </table>
-                    </div>
-
-                    <!-- EVENT COUNT -->
-                    <h2>Event Count</h2>
-                    {% show_event_count_form container=".event-count-table-container" selected_option=country.code %}
-                    <hr />
-                    <div class="">
-                        {% include "_loading.html" %}
-                        <div class="event-count-table-container" data-url="{% url "tracking:ajax_event_count" %}" data-mode="country" data-option="{{ country.code|lower }}" data-fiscal-year="0">
-                            <!-- load table here -->
-                        </div>
-                    </div>
-
-                </div>
-            </div>
-
             <!-- COMMENTS VIEW -->
             <div id="comments-view" class="row tab-pane">
                 <div class="col-md-12">
diff --git a/td/templates/resources/language_detail.html b/td/templates/resources/language_detail.html
@@ -31,8 +31,6 @@ <h1 class="language-title">{{ language.ln }}</h1>
     <ul class="nav nav-tabs view-tabs">
         <li role="presentation" class="active"><a data-toggle="tab" data-target="#general-view">General Info</a></li>
         {% if user.is_authenticated %}
-            <li role="presentation"><a data-toggle="tab" data-target="#translation-view">Translation Work</a></li>
-            <li role="presentation"><a data-toggle="tab" data-target="#translation-progress">Translation Progress</a></li>
             <li role="presentation"><a data-toggle="tab" data-target="#comments-view">Comments</a></li>
         {% endif %}
         <li role="presentation"><a data-toggle="tab" data-target="#jp-view">Joshua Project</a></li>
@@ -156,25 +154,6 @@ <h1 class="panel-title">Languages Behind {{ language.ang|default:language.name }
 
         {% if user.is_authenticated %}
 
-            <!-- TRANSLATION WORK VIEW -->
-            <div id="translation-view" class="row tab-pane project-detail">
-                <div class="col-md-12">
-                    {% if charter %}
-                        {% include "resources/_project_detail.html" with data=charter %}
-                    {% else %}
-{#                        {% url "tracking:charter_add_specific" language.pk as action_url %}#}
-                        {% include "resources/_empty_div_overlay.html" with msg="Project has not been created" action="Create Project" action_url=action_url %}
-                    {% endif %}
-                </div>
-            </div>
-
-            <!-- TRANSLATION PROGRESS VIEW -->
-            <div id="translation-progress" class="row tab-pane">
-                <div class="col-md-12">
-                    {% include "gl_tracking/_language_doc_table.html" with documents=language.documents_ordered %}
-                </div>
-            </div>
-
             <!-- COMMENTS VIEW -->
             <div id="comments-view" class="row tab-pane">
                 <div class="col-md-12">
diff --git a/td/templates/site_base.html b/td/templates/site_base.html
@@ -129,21 +129,11 @@
             <ul class="dropdown-menu" role="menu">
                 <li><a href="{% url "language_list" %}">Languages</a></li>
                 <li><a href="{% url "region_list" %}">Regions</a></li>
-                {% if user.is_authenticated %}
-                    <li class="exclusive"><a href="{% url "wa_region_list" %}">WA Regions</a></li>
-                {% endif %}
                 <li><a href="{% url "country_list" %}">Countries</a></li>
                 <li><a href="{% url "title_list" %}">Titles</a></li>
                 <li><a href="{% url "publisher_list" %}">Publishers</a></li>
-                {% if user.is_authenticated %}
-                    <li class="exclusive"><a href="{% url "tracking:project_list" %}">Charters</a></li>
-                    <li class="exclusive"><a href="{% url "tracking:event_list" %}">Events</a></li>
-                    <li class="exclusive"><a href="{% url "gl:partner_list_view" %}">Partners</a></li>
-                {% endif %}
                 <li><a href="{% url "network_list" %}">Networks</a></li>
                 {% if user.is_authenticated %}
-                    <li class="divider"></li>
-                    <li class="exclusive"><a href="{% url "gl:home" %}">GL Tracker</a></li>
                     <li class="divider"></li>
                     <li><a href="{% url "gateway_flag_update" %}">Update Gateway Languages</a></li>
                     <li><a href="{% url "rtl_languages_update" %}">Update RTL Languages (Scripts)</a></li>
diff --git a/td/tracking/views.py b/td/tracking/views.py
@@ -19,7 +19,6 @@
     View
 )
 
-from td import settings
 from td.models import Language
 from td.utils import get_wa_fy
 from .utils import get_event_total, get_event_count_data, get_total_by_month
@@ -208,10 +207,6 @@ def get_context_data(self, **kwargs):
 class CharterListView(LoginRequiredMixin, TemplateView):
     template_name = "tracking/project_list.html"
 
-    def get(self, request, *args, **kwargs):
-        messages.warning(request, settings.HOMEPAGE_MESSAGE)
-        return super(CharterListView, self).get(request, *args, **kwargs)
-
 
 class CharterAddView(LoginRequiredMixin, CreateView):
     model = Charter
@@ -315,11 +310,6 @@ def formset_valid(self, formset):
 class EventListView(LoginRequiredMixin, TemplateView):
     template_name = "tracking/event_list.html"
 
-    def get(self, request, *args, **kwargs):
-        print "Something"
-        messages.warning(request, settings.HOMEPAGE_MESSAGE)
-        return super(EventListView, self).get(request, *args, **kwargs)
-
     def get_context_data(self, **kwargs):
         context = super(EventListView, self).get_context_data(**kwargs)
         context["fy"] = get_wa_fy()
diff --git a/td/urls.py b/td/urls.py
@@ -43,8 +43,6 @@
 
     url(r"^publishing/", include("td.publishing.urls")),
     url(r"^api/", include("td.urls_api")),
-    url(r"^tracking/", include("td.tracking.urls", namespace="tracking")),
-    url(r"^gl/", include("td.gl_tracking.urls", namespace="gl")),
     url(r"^api/", include("td.api.urls", namespace="api")),
     url(r"^comment/", include("td.commenting.urls", namespace="comment")),
     url(r"^comments/", include("django_comments.urls")),
diff --git a/td/urls_languages.py b/td/urls_languages.py
@@ -8,8 +8,6 @@
     upload_rtl_list,
     RegionListView,
     RegionDetailView,
-    WARegionListView,
-    WARegionDetailView,
     AjaxCountryListView,
     CountryListView,
     CountryDetailView,
@@ -43,8 +41,6 @@
 
     url(r"^regions/$", RegionListView.as_view(), name="region_list"),
     url(r"^regions/(?P<slug>\w+)/$", RegionDetailView.as_view(), name="region_detail"),
-    url(r"^wa-regions/$", WARegionListView.as_view(), name="wa_region_list"),
-    url(r"^wa-regions/(?P<slug>\w+)/$", WARegionDetailView.as_view(), name="wa_region_detail"),
 
     url(r"^ajax/countries/$", AjaxCountryListView.as_view(), name="ajax_ds_country_list"),
     url(r"^ajax/countries/(?P<slug>\w+)/$", AjaxCountryListView.as_view(), name="ajax_wa_region_country_list"),
diff --git a/td/views.py b/td/views.py
@@ -330,10 +330,6 @@ def upload_rtl_list(request):
 class HomeView(TemplateView):
     template_name = "homepage.html"
 
-    def get(self, request, *args, **kwargs):
-        messages.warning(request, settings.HOMEPAGE_MESSAGE)
-        return super(HomeView, self).get(request, *args, **kwargs)
-
 
 class RegionListView(ListView):
     model = Region
@@ -368,10 +364,6 @@ class CountryListView(ListView):
     model = Country
     template_name = "resources/country_list.html"
 
-    def get(self, request, *args, **kwargs):
-        messages.warning(request, settings.HOMEPAGE_MESSAGE)
-        return super(CountryListView, self).get(request, *args, **kwargs)
-
     def get_queryset(self):
         qs = super(CountryListView, self).get_queryset()
         qs = qs.order_by("name")
@@ -666,10 +658,6 @@ class WARegionListView(LoginRequiredMixin, ListView):
     context_object_name = "wa_regions"
     template_name = "resources/waregion_list.html"
 
-    def get(self, request, *args, **kwargs):
-        messages.warning(request, settings.HOMEPAGE_MESSAGE)
-        return super(WARegionListView, self).get(request, *args, **kwargs)
-
 
 class WARegionDetailView(LoginRequiredMixin, DetailView):
     model = WARegion

Original file line number	Diff line number	Diff line change
`@@ -234,7 +234,6 @@`
`234`	`234`	`EMAIL_FROM = "uwadmin@unfoldingword.org"`
`235`	`235`
`236`	`236`	`EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"`
`237`		`-# EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"`
`238`	`237`
`239`	`238`	`ACCOUNT_OPEN_SIGNUP = False`
`240`	`239`	`ACCOUNT_EMAIL_UNIQUE = True`
`@@ -275,8 +274,3 @@`
`275`	`274`	`"key": os.environ.get("PORT_API_KEY"),`
`276`	`275`	`}`
`277`	`276`	`]`
`278`		`-`
`279`		`-HOMEPAGE_MESSAGE = "The ability to create and update Languages, WA Regions, Countries, Charters, Events, and Partners " \`
`280`		`- "will be suspended for all users starting on Monday, Jan. 9, 2017. These functions will be made " \`
`281`		`- "available in the new system, which is launching in a couple of weeks. Please retain the " \`
`282`		`- "information you want to enter until then."`