Merge pull request GeoNode#26 from harts-boundless/humanize_upload_count

Humanize upload count
goudine · Sep 28, 2016 · 10e504b · 10e504b
2 parents 0426f1a + e591902
commit 10e504b
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/osgeo_importer/templates/osgeo_importer/uploads-list.html b/osgeo_importer/templates/osgeo_importer/uploads-list.html
@@ -21,7 +21,17 @@ <h2 class="page-title">{% trans "Manage Your Data" %}</h2>
                 <i class="fa fa-spinner fa-spin fa-3x"></i>
             </div>
             {% verbatim %}
-            <div class="layer-upload-counts">Showing uploads {{ offset }}-{{ offset+uploads.length }} of {{ totalItems }}.</div>
+            <div class="layer-upload-counts">
+                <span ng-show="uploads.length === 0">
+                    There are currently no uploads in the database.
+                </span>
+                <span ng-show="uploads.length === 1">
+                    Showing 1 upload<span ng-show="totalItems > 1"> of {{ totalItems }}</span>.
+                </span>
+                <span ng-show="uploads.length > 1">
+                    Showing uploads {{ offset ? offset : 1 }}-{{ offset+uploads.length }} of {{ totalItems }}.
+                </span>
+            </div>
             {% endverbatim %}
             <div ng-repeat="upload in uploads">
                 <upload upload-object="upload" i="$index" static-url="{{STATIC_URL|default_if_none:"/static"}}" template-url="{{ STATIC_URL|default_if_none:'/static' }}/osgeo_importer/partials/upload.html"></upload>