Display a message when no apps can be found for this oc version

diff --git a/core/css/styles.css b/core/css/styles.css
index 74df29140a90baae0e1188d95f2c460424373793..ceb49724b48afdeb5d13817d231d8283aba5cdef 100644 (file)
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -324,7 +324,8 @@ input[type="submit"].enabled {
        overflow-x: auto;
 }
 
-#emptycontent {
+#emptycontent,
+.emptycontent {
        font-size: 16px;
        color: #888;
        position: absolute;
@@ -332,12 +333,15 @@ input[type="submit"].enabled {
        top: 30%;
        width: 100%;
 }
-#emptycontent h2 {
+#emptycontent h2,
+.emptycontent h2 {
        font-size: 22px;
        margin-bottom: 10px;
 }
 #emptycontent [class^="icon-"],
-#emptycontent [class*=" icon-"] {
+.emptycontent [class^="icon-"],
+#emptycontent [class*=" icon-"],
+.emptycontent [class*=" icon-"] {
        background-size: 64px;
        height: 64px;
        width: 64px;

diff --git a/settings/js/apps.js b/settings/js/apps.js
index bb52aa3a15551d9eed098823ce2236a6a7446b8d..8d8b2ca73981c137c036ddd51b0b4e6540936e37 100644 (file)
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -63,7 +63,9 @@ OC.Settings.Apps = OC.Settings.Apps || {
                }
                $('#apps-list')
                        .addClass('icon-loading')
+                       .removeClass('hidden')
                        .html('');
+               $('#apps-list-empty').addClass('hidden');
                $('#app-category-' + OC.Settings.Apps.State.currentCategory).removeClass('active');
                $('#app-category-' + categoryId).addClass('active');
                OC.Settings.Apps.State.currentCategory = categoryId;
@@ -73,14 +75,19 @@ OC.Settings.Apps = OC.Settings.Apps || {
                }), {
                        data:{},
                        type:'GET',
-                       success:function (apps) {
+                       success: function (apps) {
                                OC.Settings.Apps.State.apps = _.indexBy(apps.apps, 'id');
                                var source   = $("#app-template").html();
                                var template = Handlebars.compile(source);
 
-                               _.each(apps.apps, function(app) {
-                                       OC.Settings.Apps.renderApp(app, template, null);
-                               });
+                               if (apps.apps.length) {
+                                       _.each(apps.apps, function(app) {
+                                               OC.Settings.Apps.renderApp(app, template, null);
+                                       });
+                               } else {
+                                       $('#apps-list').addClass('hidden');
+                                       $('#apps-list-empty').removeClass('hidden');
+                               }
                        },
                        complete: function() {
                                $('#apps-list').removeClass('icon-loading');

diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 7465992b3b4165509cebdf048b7da3b23f01bdde..1d059d4f77fc30c3bc3ff38b1da81f7369ba432d 100644 (file)
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -96,4 +96,8 @@
 </div>
 <div id="app-content">
        <div id="apps-list" class="icon-loading"></div>
+       <div id="apps-list-empty" class="hidden emptycontent">
+               <div class="icon-search"></div>
+               <h2><?php p($l->t('No apps found for your version')) ?></h2>
+       </div>
 </div>