sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

minification of html

Browse Source
This commit is contained in:
Sander Roosendaal
2016-12-08 15:45:10 +01:00
parent ee7f22876d
commit 28d2664f38
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rowers/interactiveplots.py
View File

@@ -907,7 +907,7 @@ def interactive_flex_chart2(id=0,promember=0,
return "","CSV Data File Not Found" return "","CSV Data File Not Found"
else: else:
rowdata.sort_values(by='time',ascending=True,inplace=True) rowdata.sort_values(by='time',ascending=True,inplace=True)
workoutstateswork = [1,4,5,8,9,6,7] workoutstateswork = [1,4,5,8,9,6,7]
workoutstatesrest = [3] workoutstatesrest = [3]
workoutstatetransition = [0,2,10,11,12,13] workoutstatetransition = [0,2,10,11,12,13]
@@ -983,7 +983,7 @@ def interactive_flex_chart2(id=0,promember=0,
source2 = ColumnDataSource( source2 = ColumnDataSource(
rowdata.copy() rowdata.copy()
) )
# Add hover to this comma-separated string and see what changes # Add hover to this comma-separated string and see what changes
if (promember==1): if (promember==1):
TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair' TOOLS = 'save,pan,box_zoom,wheel_zoom,reset,tap,hover,resize,crosshair'
@@ -996,7 +996,7 @@ def interactive_flex_chart2(id=0,promember=0,
plot = Figure(x_axis_type=x_axis_type,y_axis_type=y_axis_type, plot = Figure(x_axis_type=x_axis_type,y_axis_type=y_axis_type,
tools=TOOLS, tools=TOOLS,
toolbar_sticky=False, toolbar_sticky=False
) )
x1means = Span(location=x1mean,dimension='height',line_color='green', x1means = Span(location=x1mean,dimension='height',line_color='green',
@@ -1235,8 +1235,6 @@ def interactive_flex_chart2(id=0,promember=0,
js_resources = INLINE.render_js() js_resources = INLINE.render_js()
css_resources = INLINE.render_css() css_resources = INLINE.render_css()
return [script,div,js_resources,css_resources] return [script,div,js_resources,css_resources]

10
rowers/views.py
View File

@@ -2683,14 +2683,14 @@ def workout_flexchart3_view(request,*args,**kwargs):
workstrokesonly = False workstrokesonly = False
# create interactive plot # create interactive plot
res = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1, script,div,js_resources,css_resources = interactive_flex_chart2(id,xparam=xparam,yparam1=yparam1,
yparam2=yparam2, yparam2=yparam2,
promember=promember,plottype=plottype, promember=promember,plottype=plottype,
workstrokesonly=workstrokesonly) workstrokesonly=workstrokesonly)
script = res[0] # script = res[0]
div = res[1] # div = res[1]
js_resources = res[2] # js_resources = res[2]
css_resources = res[3] # css_resources = res[3]
if row.workouttype == 'water': if row.workouttype == 'water':
return render(request, return render(request,

3
rowsandall_app/settings.py
View File

@@ -60,6 +60,9 @@ AUTHENTICATION_BACKENDS = (
) )
MIDDLEWARE_CLASSES = [ MIDDLEWARE_CLASSES = [
'django.middleware.gzip.GZipMiddleware',
'htmlmin.middleware.HtmlMinifyMiddleware',
'htmlmin.middleware.MarkRequestMiddleware',
'django.middleware.csrf.CsrfViewMiddleware', 'django.middleware.csrf.CsrfViewMiddleware',
'django.middleware.security.SecurityMiddleware', 'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware',