Show "latest release" and "total" counts

openmrs-archive · May 21, 2014 · c8ffe4a · c8ffe4a
1 parent 9cba338
commit c8ffe4a
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 4 deletions.
diff --git a/app/css/app.css b/app/css/app.css
@@ -15,6 +15,9 @@
 .module-detail-table td {
   width: 60%;
 }
+.module-detail-table td .url {
+  word-break: break-all;
+}
 .module-detail-table .no-users-label {
   color: #555555;
   font-style: italic;
@@ -27,6 +30,13 @@
 .module-detail-table .select-container {
   min-width: 18em;
 }
+.module-detail-table .count {
+  white-space: nowrap;
+}
+.module-detail-table .count .count-description {
+  font-size: 85%;
+  margin-right: 1em;
+}
 header {
   padding-top: 1.5em;
   padding-bottom: 1.5em;

diff --git a/app/css/showModule.css b/app/css/showModule.css
@@ -15,6 +15,9 @@
 .module-detail-table td {
   width: 60%;
 }
+.module-detail-table td .url {
+  word-break: break-all;
+}
 .module-detail-table .no-users-label {
   color: #555555;
   font-style: italic;
@@ -27,3 +30,10 @@
 .module-detail-table .select-container {
   min-width: 18em;
 }
+.module-detail-table .count {
+  white-space: nowrap;
+}
+.module-detail-table .count .count-description {
+  font-size: 85%;
+  margin-right: 1em;
+}
diff --git a/app/js/showControllers.js b/app/js/showControllers.js
@@ -68,7 +68,8 @@ angular.module('modulusOne.showControllers', ['ui'])
     }
 
     $scope.incrementDownload = function() {
-      $scope.latestRelease.downloadCount++
+      $scope.latestRelease.downloadCount++;
+      $scope.module.downloadCount++
     }
 
     // Search function that typeahead in the `owner` field calls

diff --git a/app/less/showModule.less b/app/less/showModule.less
@@ -11,6 +11,11 @@
   }
   td {
     width: 60%;
+
+    // Break long URLs to prevent overflow problems on small screens.
+    .url {
+      word-break: break-all;
+    }
   }
 
   .no-users-label, {
@@ -25,6 +30,17 @@
   }
 
   .select-container {
-    min-width: 18em
+    min-width: 18em;
+  }
+
+  .count {
+
+    white-space: nowrap;
+
+    .count-description {
+      font-size: 85%;
+      margin-right: 1em;
+    }
+
   }
 }
diff --git a/app/partials/showModule.html b/app/partials/showModule.html
@@ -44,7 +44,7 @@ <h2 ng-if="editable">
       <tr>
         <th>Documentation</th>
         <td ng-if="!editable">
-          <a ng-href="{{module.documentationURL}}">
+          <a class="url" ng-href="{{module.documentationURL}}">
             {{module.documentationURL}}
           </a>
         </td>
@@ -68,7 +68,15 @@ <h2 ng-if="editable">
 
       <tr>
         <th>Downloads</th>
-        <td>{{latestRelease.downloadCount}}</td>
+        <td>
+          <span class="count">{{latestRelease.downloadCount}}
+            <span class="count-description">latest release</span>
+          </span>
+          <span class="count">
+            {{module.downloadCount}}
+            <span class="count-description">total</span>
+          </span>
+        </td>
       </tr>
 
       <tr ng-switch on="editable">