Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

dashboard-ui/addPlugin.html

@@ -50,7 +50,7 @@
                             <input type="hidden" id="featureId" name="item_number" value="MBSupporter">
                             <input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php">
                             <input type="hidden" name="return" id ="paypalReturnUrl" value="#">
-                            <a data-role="button" id="ppButton" onclick="_xclick.submit();"><img src="css/images/registerpp.png"/></a>  
+                            <a data-role="button" id="ppButton" onclick="_xclick.submit();"><img src="css/images/supporter/registerpaypal.png"/></a>  
                             <p id="noEmail" style="display: none"><strong>This developer has not provided a PayPal email.  Please see their
                                                                       website for registration information.</strong>
                             </p>

dashboard-ui/scripts/ItemDetailPage.js

@@ -108,15 +108,15 @@
             });
         }
         else if (item.MediaType == "Audio") {
-            url = "css/images/itemDetails/audioDefault.png";
+            url = "css/images/items/detail/audio.png";
             useBackgroundColor = true;
         }
         else if (item.MediaType == "Game") {
-            url = "css/images/itemDetails/gameDefault.png";
+            url = "css/images/items/detail/game.png";
             useBackgroundColor = true;
         }
         else {
-            url = "css/images/itemDetails/videoDefault.png";
+            url = "css/images/items/detail/video.png";
             useBackgroundColor = true;
         }
 
@@ -299,7 +299,7 @@
 
                 html += '<img src="' + imgUrl + '" />';
             } else {
-                html += '<img src="css/images/itemDetails/videoDefault.png"/>';
+                html += '<img src="css/images/items/list/chapter.png"/>';
             }
 
             html += '<div class="posterViewItemText posterViewItemPrimaryText">' + chapter_name + '</div>';
@@ -344,29 +344,29 @@
 
         if (imageTags.Logo) {
 
-            html += ItemDetailPage.createGalleryImage(item, "Logo", item.ImageTags.Logo);
+            html += ItemDetailPage.createGalleryImage(item.Id, "Logo", item.ImageTags.Logo);
         }
         if (imageTags.Thumb) {
 
-            html += ItemDetailPage.createGalleryImage(item, "Thumb", item.ImageTags.Thumb);
+            html += ItemDetailPage.createGalleryImage(item.Id, "Thumb", item.ImageTags.Thumb);
         }
         if (imageTags.Art) {
 
-            html += ItemDetailPage.createGalleryImage(item, "Art", item.ImageTags.Art);
+            html += ItemDetailPage.createGalleryImage(item.Id, "Art", item.ImageTags.Art);
 
         }
         if (imageTags.Menu) {
 
-            html += ItemDetailPage.createGalleryImage(item, "Menu", item.ImageTags.Menu);
+            html += ItemDetailPage.createGalleryImage(item.Id, "Menu", item.ImageTags.Menu);
 
         }
         if (imageTags.Disc) {
 
-            html += ItemDetailPage.createGalleryImage(item, "Disc", item.ImageTags.Disc);
+            html += ItemDetailPage.createGalleryImage(item.Id, "Disc", item.ImageTags.Disc);
         }
         if (imageTags.Box) {
 
-            html += ItemDetailPage.createGalleryImage(item, "Box", item.ImageTags.Box);
+            html += ItemDetailPage.createGalleryImage(item.Id, "Box", item.ImageTags.Box);
         }
 
         if (item.BackdropImageTags) {
@@ -380,7 +380,7 @@
         $('#galleryContent', page).html(html).trigger('create');
     },
 
-    createGalleryImage: function(item_id, type, tag, index) {
+    createGalleryImage: function(itemId, type, tag, index) {
 
         var downloadWidth = 400;
         var lightboxWidth = 800;
@@ -389,7 +389,7 @@
         if (typeof(index)=="undefined") index = 0;
 
         html += '<a href="#pop_'+index+'_'+tag+'" data-transition="fade" data-rel="popup" data-position-to="window">';
-        html += '<img class="galleryImage" src="' + ApiClient.getImageUrl(item_id, {
+        html += '<img class="galleryImage" src="' + ApiClient.getImageUrl(itemId, {
             type: type,
             width: downloadWidth,
             tag: tag,
@@ -397,7 +397,7 @@
         }) + '" />';
         html += '<div class="galleryPopup" id="pop_'+index+'_'+tag+'" data-role="popup" data-theme="d" data-corners="false" data-overlay-theme="a">';
         html += '<a href="#" data-rel="back" data-role="button" data-theme="a" data-icon="delete" data-iconpos="notext" class="ui-btn-right">Close</a>';
-        html += '<img class="" src="' + ApiClient.getImageUrl(item_id, {
+        html += '<img class="" src="' + ApiClient.getImageUrl(itemId, {
             type: type,
             width: lightboxWidth,
             tag: tag,

dashboard-ui/scripts/PluginCatalogPage.js

@@ -43,14 +43,14 @@
             if (plugin.thumbImage) {
                 html += "<img src='" + plugin.thumbImage + "' />";
             } else {
-                html += "<img style='background:#444444;' src='css/images/defaultCollectionImage.png' />";
+                html += "<img style='background:#444444;' src='css/images/items/list/collection.png' />";
             }
 
             if (plugin.isPremium) {
                 if (plugin.price > 0) {
-                    html += "<div class='premiumBanner'><img src='css/images/premiumflag.png' /></div>";
+                    html += "<div class='premiumBanner'><img src='css/images/supporter/premiumflag.png' /></div>";
                 } else {
-                    html += "<div class='premiumBanner'><img src='css/images/supporterflag.png' /></div>";
+                    html += "<div class='premiumBanner'><img src='css/images/supporter/supporterflag.png' /></div>";
                 }
             }
 

dashboard-ui/scripts/site.js

@@ -460,7 +460,7 @@ var Dashboard = {
                     tag: item.BackdropImageTags[0]
                 }) + "' />";
             } else {
-                html += "<img style='background:" + Dashboard.getRandomMetroColor() + ";' src='css/images/defaultCollectionImage.png' />";
+                html += "<img style='background:" + Dashboard.getRandomMetroColor() + ";' src='css/images/items/list/collection.png' />";
             }
 
             if (showText) {
@@ -750,7 +750,7 @@ var Dashboard = {
 
         Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
             if (pluginSecurityInfo.IsMBSupporter) {
-                $('<a class="imageLink" href="supporter.html"><img src="css/images/suppbadge.png" /></a>').insertBefore('.btnTools', page);
+                $('<a class="imageLink" href="supporter.html"><img src="css/images/supporter/supporterbadge.png" /></a>').insertBefore('.btnTools', page);
             }
         });
     },

dashboard-ui/supporter.html

@@ -55,7 +55,7 @@
                                 <input type="hidden" name="item_number" value="MBSupporter">
                                 <input type="hidden" name="notify_url" value="http://mb3admin.com/admin/service/services/ppipn.php">
                                 <input type="hidden" name="return" id ="paypalReturnUrl" value="#">
-                                <a data-role="button" onclick="_xclick.submit();"><img src="css/images/donatepp.png"/></a>  
+                                <a data-role="button" onclick="_xclick.submit();"><img src="css/images/supporter/donatepaypal.png"/></a>  
                                 
                                 <p><small><em>This button is now <strong>live</strong>. Transactions will result in real money being transferred.</em></small></p>
                             

dashboard-ui/wizardLibrary.html

@@ -10,7 +10,7 @@
 
             <div class="ui-corner-all ui-shadow wizardContent">
                 <h2>
-                    <img src="css/images/movieFolder.png" />Media Library</h2>
+                    <img src="css/images/mblogoicon.png" />Media Library</h2>
 
                 <p id="fldUseDefaultLibrary" style="display: none;">
                     <input type="checkbox" id="chkUseDefaultLibrary" name="chkUseDefaultLibrary" onchange="MediaLibraryPage.setUseDefaultMediaLibrary(this.checked);" />

dashboard-ui/wizardStart.html

@@ -10,7 +10,7 @@
 
             <div class="ui-corner-all ui-shadow wizardContent">
                 <h2>
-                    <img src="css/images/cloudNetwork.png" />Welcome to Media Browser Server!</h2>
+                    <img src="css/images/mblogoicon.png" />Welcome to Media Browser Server!</h2>
 
                 <p>This wizard will help guide you through the setup process.</p>
                 <div class="wizardNavigation">

dashboard-ui/wizardUser.html

@@ -11,7 +11,7 @@
             <div class="ui-corner-all ui-shadow wizardContent">
                 <form id="wizardUserForm">
                     <h2>
-                        <img src="css/images/currentUserDefaultBlack.png" style="height: 30px;" />Tell Us About Yourself</h2>
+                        <img src="css/images/mblogoicon.png" style="height: 30px;" />Tell Us About Yourself</h2>
 
                     <p>Media Browser includes built-in support for user profiles, enabling each user to have their own display settings, playstate and ratings.</p>