Skip to content

Commit

Permalink
Merge pull request #70 from eduNEXT/jv/fix-feedback-ui-problems
Browse files Browse the repository at this point in the history
fix: large text for rating
  • Loading branch information
farhan authored Mar 26, 2024
2 parents ae9ef41 + 4126ab6 commit cb3c38d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
7 changes: 6 additions & 1 deletion feedback/static/css/feedback.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
/* Overall block. We limit width, and put a very faint
border around it. */
.feedback_block {
max-width: 450px;
display: inline-block;
border-width: 1px;
border-style: solid;
border-color: rgba(0,0,0,0.1);
Expand Down Expand Up @@ -115,3 +115,8 @@
.feedback_block .feedback_submit_feedback {
width:100%;
}

.feedback_likert_scale {
display: flex;
flex-direction: row;
}
16 changes: 8 additions & 8 deletions feedback/static/html/feedback_instructor.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,35 +6,35 @@
<table role="table" class="pgn__data-table is-striped">
<thead>
<tr role="row">
<th colspan="6" role="columnheader">
<th role="columnheader" style="width:100%">
<span class="d-flex align-items-center"><span>{% trans "Component" %}</span></span>
</th>
<th colspan="3" role="columnheader">
<th role="columnheader" style="width:100%">
<span class="d-flex align-items-center"><span>{% trans "Number of ratings" %}</span></span>
</th>
<th colspan="3" role="columnheader">
<th role="columnheader" style="width:40%">
<span class="d-flex align-items-center"><span>{% trans "Average rating" %}</span></span>
</th>
<th colspan="8" role="columnheader">
<th role="columnheader" style="width:100%">
<span class="d-flex align-items-center"><span>{% trans "Feedback " %}</span></span>
</th>
</tr>
</thead>
<tbody role="rowgroup">
{% for block in blocks %}
<tr role="row" class="pgn__data-table-row">
<td colspan="6" role="cell" class="pgn__data-table-cell-wrap">
<td role="cell" class="pgn__data-table-cell-wrap">
<a class="admin-panel" href="{{ block.url }}"><button class="btn btn-primary" ="button">{{ block.section_display_name }} > {{ block.subsection_display_name }} > {{ block.unit_display_name }} > {{ block.display_name }}</button></a>
</td>
<td colspan="3" role="cell" class="pgn__data-table-cell-wrap">
<td role="cell" class="pgn__data-table-cell-wrap">
<ul>
{% for vote_aggregate in block.vote_aggregate %}
<li>{{ vote_aggregate.scale_text }}: {{ vote_aggregate.count }}</li>
{% endfor %}
</ul>
</td>
<td colspan="3" role="cell" class="pgn__data-table-cell-wrap">{{ block.average_rating }}</td>
<td colspan="8" role="cell" class="pgn__data-table-cell-wrap">
<td role="cell" class="pgn__data-table-cell-wrap">{{ block.average_rating }}</td>
<td role="cell" class="pgn__data-table-cell-wrap">
<ul>
{% for feedback in block.answers %}
<li>{% trans "Comment" %}: {{ feedback.user_freeform }}. {% trans "Vote" %}: {% if feedback.user_vote != -1 %} {{ feedback.user_vote }} {% else %} {% trans "No vote" %} {% endif %}</li>
Expand Down

0 comments on commit cb3c38d

Please sign in to comment.