git-svn-id: https://msi/svn/firstRepo/WebClient/branches/NewRelease@49 0f545695-f87b-41b6-9a03-7f16563b5454

js/jqm-config.js

@@ -11,8 +11,8 @@ define(['jquery'], function ($) {
         $.mobile.buttonMarkup.hoverDelay = 0;
         // Remove page from DOM when it's being replaced
         $(document).on("pagecontainerhide", function (event, ui) {
-            ui.prevPage.remove();
-            //$("div[data-role='page'][stay-in-page='false']:not(.ui-page-active)").remove();
+            //ui.prevPage.remove();
+            $("div[data-role='page'][stay-in-page='false']:not(.ui-page-active)").remove();
         });
     });
 });

js/model/categoryItem/categoryItemCollection.js

@@ -12,7 +12,7 @@ var CategoryItems = CachedCollection.extend({
         model:Category,
           
         url: function() {
-            return myManifest.Settings.DefaultURL + "/api/categoryitems/" + this.categoryId;
+            return myManifest.Settings.DefaultURL + "/api/ricette/" + this.categoryId;
         }
   });
 

js/model/categoryItem/foundItemCollection.js

@@ -28,7 +28,7 @@ define(['app', 'jquery', 'underscore', 'backbone', 'model/categoryItem/searchIte
             },
 
             url: function() {
-                var u = myManifest.Settings.DefaultURL + "/api/categoryitems/search/" + 
+                var u = myManifest.Settings.DefaultURL + "/api/ricette/search/" + 
                         this.numItems + 
                         "/" + this.indexItems + 
                         "/" + this.dataFilter.categoryId +

js/modules/category/categoryItemTemplate.html

@@ -3,7 +3,11 @@
 <%} else { for (var i = 0; i < data.length; i++) { %>
   <% var item = data[i]; %>
 <li><a href="#ricetta/<%= item.ricetta_id%>" class="ui-btn ui-btn-icon-right ui-icon-carat-r">
-	<!--<img src="Resources\img\ricettaND_80.png">-->
+	<% if(item.firstImage === ""){ %>
+		<img src='Resources\img\ricettaND_80.png'>
+	<%}else{%>
+		<img src='<%=myManifest.Settings.DefaultURL%>/api/photo/thumbnail/<%=item.firstImage%>'>
+	<%}%>
     <div class='ricettaTitolo'><%= unescape(item.titolo) %></div>
     <div class='ricettaAutore'><%= unescape(item.autore) %></div>
     <br><div class='ricettaAutore'>Diff.:&nbsp;&nbsp;</div>

js/router.js

@@ -1,7 +1,7 @@
 define(['jquery', 'underscore', 'backbone',
     'modules/home/home', 'modules/faq/faq', 'modules/index/index', 'modules/category/category', 'modules/item/item',
     'modules/about/about', 'modules/search/search', 'modules/search/found', 'modules/more/more', 'modules/note/note',
-    'modules/sync/sync', 'modules/converter/converter', 'modules/donation/donation', 'modules/settings/settings',
+    'modules/sync/sync', 'modules/donation/donation','modules/settings/settings',
     'modules/debug/debug','modules/maps/maps',
     'model/note/noteCollection', 'model/category/categoryCollection', 'model/categoryItem/categoryItemCollection',
     'model/item/itemCollection', 'model/item/ingredientiCollection', 'model/categoryItem/foundItemCollection',
@@ -10,7 +10,7 @@ define(['jquery', 'underscore', 'backbone',
         function ($, _, Backbone,
                 HomeView, FaqView, IndexView, CategoryView, ItemView,
                 AboutView, SearchView, FoundView, MoreView, NoteView,
-                SyncView, ConverterView, DonationView, SettingsView,
+             SyncView, DonationView, SettingsView,
                 DebugView, MapsView,
                 NoteCollection, CategoryCollection, CategoryItemCollection,
                 ItemCollection, IngredientiCollection, FoundItemCollection,
@@ -149,11 +149,7 @@ define(['jquery', 'underscore', 'backbone',
                     //indexView.render();
                     itemView.bind('renderCompleted:Item', this.changePage, this);
                 },
-                showConverter: function () {
-                    var converterView = new ConverterView();
-                    converterView.render();
-                    this.changePage(converterView);
-                },
+
                 showMore: function () {
                     var moreView = new MoreView();
                     moreView.render();