Merge pull request #63 from UW-Madison-DoIT/marketplace_name

MUMUP-1381 : Display portlet titles, not portlet names, in Marketplace.

src/main/webapp/js/marketplace/marketplace-controller.js

@@ -58,7 +58,6 @@
               success: function (request, text){
                 $('.fname-'+fname).html('<i class="fa fa-check"></i> Added Successfully').prop('disabled',true).removeClass('btn-add').addClass('btn-added');
 				miscService.pushGAEvent('Layout Modification', 'Add', portlet.name);
-                portlet.title = portlet.name;
                 $scope.$apply(function(){
                     var marketplaceEntries = $.grep($sessionStorage.marketplace, function(e) { return e.fname === portlet.fname});
                     if(marketplaceEntries.length > 0) {
@@ -92,7 +91,7 @@
 
     $scope.searchTermFilter = function(portlet) {
       return ($scope.searchTerm === undefined
-        || portlet.name.toLowerCase().indexOf($scope.searchTerm.toLowerCase()) !== -1
+        || portlet.title.toLowerCase().indexOf($scope.searchTerm.toLowerCase()) !== -1
         || (portlet.description !== null && portlet.description.toLowerCase().indexOf($scope.searchTerm.toLowerCase()) !== -1)
       );
     };

src/main/webapp/partials/marketplace-portlet.html

@@ -2,7 +2,7 @@
   <h2>
     <span class="fa fa-circle" ng-show="portlet.faIcon === null"></span>
     <span class="fa {{::portlet.faIcon}}" ng-show="portlet.faIcon != null"></span>
-    <span class="portlet-title">{{::portlet.name}}</span>
+    <span class="portlet-title">{{::portlet.title}}</span>
   </h2>
   <div class="action-buttons" ng-click="showDetails = !showDetails">
 
@@ -40,7 +40,7 @@ <h2>
   <span><rating ng-model="portlet.rating" readonly="true" class="rating"></rating>
     ( {{:: portlet.userRated }} rating<span ng-if="portlet.userRated !== 1">s</span> )
   </span>
-  <span> | <button ng-click="openRating('sm',portlet.fname, portlet.name)" class="btn btn-default">Rate</button></span>
+  <span> | <button ng-click="openRating('sm',portlet.fname, portlet.title)" class="btn btn-default">Rate</button></span>
   <p>{{::portlet.description}}</p>
   <div class="category-list" ng-click="showDetails = !showDetails">
     <a ng-repeat="category in portlet.categories" href="" ng-click="selectFilter('category',category)" class="category-links">{{::category}}</a>
@@ -75,7 +75,7 @@ <h2>
     <div class="col-xs-12 col-sm-3 related-portlets">
       <h3>Related</h3>
       <ul ng-repeat="related in portlet.relatedPortlets">
-        <li><a href="{{ ::related.maxUrl }}">{{ ::related.name }}</a></li>
+        <li><a href="{{ ::related.maxUrl }}">{{ ::related.title }}</a></li>
       </ul>
     </div>
     <div class="col-xs-12 col-sm-9 portlet-screenshots" ng-if="portlet.marketplaceScreenshots.length !== 0">