Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c92bb0 authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Merge branch 'dev/sorting-and-no-of-device-issue' into 'master' 

Sorting devices by release year shows duplicated values

See merge request e/documentation/user!671
parents 585f8155 eb5e1b1c

htdocs/_i18n/en/pages/devices.html

+10 −2
Original line number Diff line number Diff line
@@ -382,17 +382,25 @@ 
            </ul>

          </td>

          <td class="release">

            {% assign release_date_array = "" | split: ',' %}



            {% if device.release[0] %}

              {% for release_date_obj in device.release %}

                {% for release_date_pair in release_date_obj %}

                  {% assign date = release_date_pair[1] | split: '-' %}

                  {{ date[0] }} <br />

                  {% assign release_date_array = release_date_array | push: date[0] %}

                {% endfor %}

              {% endfor %}

            {% else %}

              {% assign date = device.release | split: '-' %}

              {{ date[0] }}

              {% assign release_date_array = release_date_array | push: date[0] %}

            {% endif %}

            {% assign releasedates = release_date_array | uniq %}

            <ul class="list-unstyled">

            {% for releasedate in releasedates %}

              <li>{{ releasedate }}</li>

            {% endfor %}

            </ul>

          </td>

              <td class="size">{{ device.screen | replace: 'in','"' }}</td>

              <td class="battery">

htdocs/assets/css/style.scss

+6 −1
Original line number Diff line number Diff line
@@ -161,6 +161,11 @@ thead th { 
  margin-left: 10px;

}



ul.list-unstyled,

ol.list-unstyled {

  margin-left: 0;

}



.jobs-table th:first-child {

  width: 25%;

}