Private
Public Access
1
0

wrapping text in some tables

This commit is contained in:
Sander Roosendaal
2018-03-11 10:54:57 +01:00
parent 843a94c579
commit a94912e124
6 changed files with 40 additions and 4 deletions

View File

@@ -0,0 +1,6 @@
<h2>Notes</h2>
<p>
<div class="wrapwords">
{{ workout.notes }}
</div>
</p>

View File

@@ -0,0 +1,13 @@
{% load rowerfilters %}
{% load tz %}
<div class="grid_6 suffix_3 alpha">
<table width=100%>
<tr>
<th>Comments</th>
<td>
<a href="/rowers/workout/{{ workout.id }}/comment">Comment ({{ aantalcomments }})</a>
</td>
</tr>
</table>
</div>

View File

@@ -33,15 +33,15 @@
<div class="grid_12 alpha"> <div class="grid_12 alpha">
<div id="left" class="grid_6 alpha"> <div id="left" class="grid_6 alpha">
<h1>Session {{ psdict.name.1 }}</h1> <h1>Session {{ psdict.name.1 }}</h1>
<table class="listtable shortpadded" width="80%"> <table class="listtable shortpadded" width="95%">
{% for attr in attrs %} {% for attr in attrs %}
{% for key,value in psdict.items %} {% for key,value in psdict.items %}
{% if key == attr %} {% if key == attr %}
<tr> <tr>
{% if key == 'comment' %} {% if key == 'comment' %}
<td><b>{{ value.0 }}</b></td><td>{{ value.1|linebreaks }}</td> <td><b>{{ value.0 }}</b></td><td class="wrapwords">{{ value.1|linebreaks }}</td>
{% else %} {% else %}
<td><b>{{ value.0 }}</b></td><td>{{ value.1 }}</td> <td><b>{{ value.0 }}</b></td><td class="wrapwords">{{ value.1 }}</td>
{% endif %} {% endif %}
</tr> </tr>
{% endif %} {% endif %}

View File

@@ -22,6 +22,8 @@ workflowmiddlepanel = (
('panel_summary.html','Summary'), ('panel_summary.html','Summary'),
('panel_map.html','Map'), ('panel_map.html','Map'),
('panel_comments.html','Basic Info and Links'), ('panel_comments.html','Basic Info and Links'),
('panel_notes.html','Workout Notes'),
('panel_shortcomment.html','Comment Link'),
('panel_middlesocial.html','Social Media Share Buttons'), ('panel_middlesocial.html','Social Media Share Buttons'),
) )

View File

@@ -6194,6 +6194,7 @@ def workouts_view(request,message='',successmessage='',
startdate=timezone.now()-datetime.timedelta(days=365), startdate=timezone.now()-datetime.timedelta(days=365),
enddate=timezone.now()+datetime.timedelta(days=1), enddate=timezone.now()+datetime.timedelta(days=1),
teamid=0,rankingonly=False,rowerid=0,userid=0): teamid=0,rankingonly=False,rowerid=0,userid=0):
request.session['referer'] = absolute(request)['PATH'] request.session['referer'] = absolute(request)['PATH']
try: try:
if rowerid != 0: if rowerid != 0:
@@ -6259,7 +6260,7 @@ def workouts_view(request,message='',successmessage='',
if theteam.viewing == 'allmembers' or theteam.manager == request.user: if theteam.viewing == 'allmembers' or theteam.manager == request.user:
workouts = Workout.objects.filter(team=theteam, workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=startdate, startdatetime__gte=startdate,
startdatetime__lte=enddate).order_by("-startdatetime") startdatetime__lte=enddate).order_by("-date","-starttime")
g_workouts = Workout.objects.filter(team=theteam, g_workouts = Workout.objects.filter(team=theteam,
startdatetime__gte=activity_startdate, startdatetime__gte=activity_startdate,
startdatetime__lte=activity_enddate).order_by("-date", "-starttime") startdatetime__lte=activity_enddate).order_by("-date", "-starttime")

View File

@@ -841,3 +841,17 @@ a.wh:hover {
color: #000; color: #000;
} }
.wrapwords{
-ms-word-break: break-all;
word-break: break-all;
/* Non standard for webkit */
word-break: break-word;
-webkit-hyphens: auto;
-moz-hyphens: auto;
-ms-hyphens: auto;
hyphens: auto;
}