diff options
| -rw-r--r-- | js/settings.admin.js | 10 | ||||
| -rw-r--r-- | templates/settings.admin.php | 14 |
2 files changed, 17 insertions, 7 deletions
diff --git a/js/settings.admin.js b/js/settings.admin.js index 49b5f33..2959f2f 100644 --- a/js/settings.admin.js +++ b/js/settings.admin.js @@ -131,18 +131,26 @@ $(document) $('#solr_current_docs').text( 'Solr Core is down'); else { - if (response.needed_index == 2) { + if (response.solr_lock > 0) { + $('#nextant_first_index').hide(delay); + $('#nextant_index_scheduled').hide(delay); + $('#nextant_force_index').hide(delay); + $('#nextant_index_inprogress').show(delay); + } else if (response.needed_index == 2) { $('#nextant_first_index').show(delay); $('#nextant_index_scheduled').hide(delay); $('#nextant_force_index').hide(delay); + $('#nextant_index_inprogress').hide(delay); } else if (response.needed_index == 1) { $('#nextant_first_index').hide(delay); $('#nextant_force_index').hide(delay); $('#nextant_index_scheduled').show(delay); + $('#nextant_index_inprogress').hide(delay); } else { $('#nextant_first_index').hide(delay); $('#nextant_index_scheduled').hide(delay); $('#nextant_force_index').show(delay); + $('#nextant_index_inprogress').hide(delay); } if (response.current_docs > 0) $('#solr_current_docs').text( diff --git a/templates/settings.admin.php b/templates/settings.admin.php index 7dbd289..e400e60 100644 --- a/templates/settings.admin.php +++ b/templates/settings.admin.php @@ -135,18 +135,20 @@ style('nextant', 'admin'); <td></td> <td> <div id="nextant_first_index" - style="width: 350px; font-size: 12px; white-space: normal;"> - <i></i> It is really adviced that your very first index of your - files is done using the <b>./occ nextant:index</b> command. <br /> - However, you can force it to be started as a background process - of your cloud: </i> <br /> + style="width: 270px; font-size: 12px; white-space: normal;"> + <i></i> we recommand doing the very first indexing of your files + using the <b>./occ nextant:index</b> command.<br /> However, you + can force it to be started as a background process: </i> <br /> <button type="button" id="nextant_force_first_index" style="width: 270px"><?php p($l->t('Force first index as a cronjob')) ?></button> </div> <button type="button" id="nextant_force_index" style="width: 270px"><?php p($l->t('Force index')) ?></button> <div id="nextant_index_scheduled"> - <i>Index is scheduled within the next few hours (cron)</i> + <i>Indexing is scheduled within the next few hours (cron)</i> + </div> + <div id="nextant_index_inprogress"> + <i>Indexing in progress</i> </div> </td> </tr> |