remove tinyMCE more

core/forms.py

@@ -158,7 +158,8 @@ class UploadFileForm(forms.Form):
     def __init__(self):
         title = forms.CharField(max_length=50)
         file  = forms.FileField()
-        html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30}))
+        #html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30}))
+        html = forms.CharField(widget=forms.Textarea(attrs={"cols":80, "rows":20}))
         lon_utm = forms.FloatField(required=False)
         lat_utm = forms.FloatField(required=False)
         slug = forms.CharField(max_length=50)

core/views_logbooks.py

@@ -167,58 +167,6 @@ def personForm(request,pk):
     form=PersonForm(instance=person)
     return render(request,'personform.html', {'form':form,})
 
-def pathsreport(request):
-    pathsdict={
-    "ADMIN_MEDIA_PREFIX" : ADMIN_MEDIA_PREFIX,
-    "ADMIN_MEDIA_PREFIX" : ADMIN_MEDIA_PREFIX,
-    "CAVEDESCRIPTIONSX" : CAVEDESCRIPTIONS,
-    "DIR_ROOT" : DIR_ROOT,
-    "ENTRANCEDESCRIPTIONS" : ENTRANCEDESCRIPTIONS,
-    "EXPOUSER_EMAIL" : EXPOUSER_EMAIL,
-    "EXPOUSERPASS" :"<redacted>",
-    "EXPOUSER" : EXPOUSER,
-    "EXPOWEB" : EXPOWEB,
-    "EXPOWEB_URL" : EXPOWEB_URL,
-    "FILES" : FILES,
-    "JSLIB_URL" : JSLIB_URL,
-    "LOGFILE" : LOGFILE,
-    "LOGIN_REDIRECT_URL" : LOGIN_REDIRECT_URL,
-    "MEDIA_ADMIN_DIR" : MEDIA_ADMIN_DIR,
-    "MEDIA_ROOT" : MEDIA_ROOT,
-    "MEDIA_URL" : MEDIA_URL,
-    #"PHOTOS_ROOT" : PHOTOS_ROOT,
-    "PHOTOS_URL" : PHOTOS_URL,
-    "PYTHON_PATH" : PYTHON_PATH,
-    "REPOS_ROOT_PATH" : REPOS_ROOT_PATH,
-    "ROOT_URLCONF" : ROOT_URLCONF,
-    "STATIC_ROOT" : STATIC_ROOT,
-    "STATIC_URL" : STATIC_URL,
-    "SURVEX_DATA" : SURVEX_DATA,
-    "SURVEY_SCANS" : SURVEY_SCANS,
-    "SURVEYS" : SURVEYS,
-    "SURVEYS_URL" : SURVEYS_URL,
-    "SVX_URL" : SVX_URL,
-    "TEMPLATE_DIRS" : TEMPLATE_DIRS,
-    "THREEDCACHEDIR" : THREEDCACHEDIR,
-    "TINY_MCE_MEDIA_ROOT" : TINY_MCE_MEDIA_ROOT,
-    "TINY_MCE_MEDIA_URL" : TINY_MCE_MEDIA_URL,
-    "TUNNEL_DATA" : TUNNEL_DATA,
-    "URL_ROOT" : URL_ROOT
-    }
-    
-    ncodes = len(pathsdict)
-
-    bycodeslist = sorted(pathsdict.items())
-    bypathslist = sorted(iter(pathsdict.items()), key=lambda x: x[1])
-
-    return render(request, 'pathsreport.html', { 
-        "pathsdict":pathsdict, 
-        "bycodeslist":bycodeslist, 
-        "bypathslist":bypathslist, 
-        "ncodes":ncodes})
-
-
-    
 def experimental(request):
     blockroots = models.SurvexBlock.objects.filter(name="rootblock")
     if len(blockroots)>1:

core/views_statistics.py

@@ -53,16 +53,22 @@ def pathsreport(request):
     "SVX_URL" : SVX_URL,
     "TEMPLATE_DIRS" : TEMPLATE_DIRS,
     "THREEDCACHEDIR" : THREEDCACHEDIR,
-    "TINY_MCE_MEDIA_ROOT" : TINY_MCE_MEDIA_ROOT,
+#    "TINY_MCE_MEDIA_ROOT" : TINY_MCE_MEDIA_ROOT,
-    "TINY_MCE_MEDIA_URL" : TINY_MCE_MEDIA_URL,
+#    "TINY_MCE_MEDIA_URL" : TINY_MCE_MEDIA_URL,
     "TUNNEL_DATA" : TUNNEL_DATA,
     "URL_ROOT" : URL_ROOT
     }
-    
+    # settings are unique by paths are not
     ncodes = len(pathsdict)
-
     bycodeslist = sorted(pathsdict.items())
-    bypathslist = sorted(iter(pathsdict.items()), key=lambda x: x[1])
+    
+    # create a temporary list
+    bypathslist = []
+    # iterate through the dictionary and append each tuple into the temporary list 
+    for key, value in pathsdict.items():
+        tmptuple = (key, value)
+        bypathslist.append(tmptuple)
+    # bypathslist = sorted(bypathslist)
 
     return render(request, 'pathsreport.html', { 
         "pathsdict":pathsdict, 

parsers/logbooks.py

@@ -2,9 +2,9 @@
 import csv
 import datetime
 import os
-import pickle
 import re
 import time
+import pickle
 import shelve
 
 from django.conf import settings
@@ -205,7 +205,7 @@ def EnterLogIntoObjStore(year, date, tripcave, triptitle, text, trippeople, tu,
     # or design a different way to do it.
     #trippersons, author = GetTripPersons(trippeople, expedition, logtime_underground)
     # if not author:
-        # print(" ! - Skipping logentry: " + title + " - no author for entry")
+        # print(" ! - Skipping logentry: " + title + " - no RECOGNISED author for entry")
         # message = " ! - Skipping logentry: %s - no author for entry in year '%s'" % (title, expedition.year)
         # DataIssue.objects.create(parser='logbooks', message=message)
         # logdataissues[tid+"author"]=message

templates/editcave.html

@@ -6,7 +6,7 @@
 <link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" />
 <script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
 <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
-<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
+<!--<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>-->
 {{ tripForm.media }}
 {% endblock %}
 {% block content %}

templates/editcave2.html

@@ -6,7 +6,7 @@
 <link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" />
 <script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
 <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
-<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
+<!--<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>-->
 {% endblock %}
 {% block content %}
 <h1>Edit Cave</h1>

templates/editentrance.html

@@ -5,8 +5,7 @@
 
 <link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" />
 <script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
-<script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
+!--<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>-->
-<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
 {% endblock %}
 {% block content %}
 <form action="" method="post">{% csrf_token %}

templates/editfile.html

@@ -24,7 +24,8 @@
 <link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" />
 <script src="{{ settings.JSLIB_URL }}jquery-ui/jquery-ui.min.js" type="text/javascript"></script>
 <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
-<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
+<!--<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
+-->
 {{ fileForm.media }}
 {% endblock %}
 {% block content %}

templates/editflatpage.html

@@ -2,12 +2,8 @@
 {% block title %}Edit {{ path }}{% endblock %}
 {% block extrahead %}
 {% load csrffaker %} 
-<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
+<!--<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>-->
-<script type="text/javascript">
+<!-- <script type="text/javascript"> tinyMCE.init({ mode : "textareas"  }); </script>-->
-    tinyMCE.init({
-      mode : "textareas"
-    });
-</script>
 {% endblock %}
 {% block body %}
 <h1>Edit {{ path }}</h1>

templates/newlogbookentry.html

@@ -20,7 +20,7 @@
 <link rel="stylesheet" href="{{ settings.JSLIB_URL }}jquery-ui/css/lightness/jquery-ui.css" type="text/css" media="all" />
 <script src="{{ settings.JSLIB_URL }}jquery/jquery-ui.min.js" type="text/javascript"></script>
 <script src="{{ settings.MEDIA_URL }}js/jquery.formset.min.js" type="text/javascript"></script>
-<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>
+<!--<script src="{{ settings.TINY_MCE_MEDIA_URL }}tiny_mce.js" type="text/javascript"></script>-->
 {{ tripForm.media }}
 {% endblock %}
 {% block content %}