diff options
| author | daita <maxence@pontapreta.net> | 2016-10-14 00:17:40 +0300 |
|---|---|---|
| committer | daita <maxence@pontapreta.net> | 2016-10-14 00:17:40 +0300 |
| commit | 7ccc7cf2544848e8ccd66f238cea9708a663b010 (patch) | |
| tree | 6b37e1a3fc8e74a87d8160222f49934088e2f495 | |
| parent | 9c58cc1ef04381ef4b3d958966198053fe53820b (diff) | |
display saving animation
| -rw-r--r-- | css/admin.css | 10 | ||||
| -rw-r--r-- | js/settings.admin.js | 18 | ||||
| -rw-r--r-- | lib/Service/ConfigService.php | 9 | ||||
| -rw-r--r-- | templates/settings.admin.php | 11 |
4 files changed, 33 insertions, 15 deletions
diff --git a/css/admin.css b/css/admin.css index 93a410a..b671d33 100644 --- a/css/admin.css +++ b/css/admin.css @@ -1,3 +1,13 @@ +#nextant_saving { + font-weight: bolder; + font-size: 12px; + margin-left: 30px; + font-style: italic; + opacity: 0.5; + filter: alpha(opacity = 50); + opacity: 0.5; +} + #nextant-display { width: 400px; height: 250px; diff --git a/js/settings.admin.js b/js/settings.admin.js index 4ab11fa..d47295c 100644 --- a/js/settings.admin.js +++ b/js/settings.admin.js @@ -29,6 +29,7 @@ $(document) var nextantSettings = { init : function() { + $('#nextant_saving').fadeOut(0); nextantSettings.statusclearall(true); nextantSettings.checksuboptions(true); setInterval(function() { @@ -36,8 +37,17 @@ $(document) }, 60000); }, + saving : function(load) { + if (load) { + $('#nextant_saving').fadeIn(50); + } else + $('#nextant_saving').fadeOut(50); + }, + savesuboptions : function(switched) { + nextantSettings.saving(true); + var index_files_needed = -1; if (switched == 'force_index') index_files_needed = 1; @@ -89,6 +99,8 @@ $(document) if (response.instant == 'true') delay = 0; + nextantSettings.saving(false); + $('#nextant_version') .text(response.nextant_version); $('#solr_url').val(response.solr_url); @@ -282,14 +294,12 @@ $(document) break; case 'save': + nextantSettings.saving(true); nextantSettings .status( '#save', 'All test went fine. Saving your configuration', 0); - setTimeout(function() { - nextantSettings.checksuboptions(false); - }, 1000); break; } @@ -353,7 +363,9 @@ $(document) break; case 'save': + nextantSettings.saving(false); nextantSettings.reset(); + nextantSettings.checksuboptions(false); break; } diff --git a/lib/Service/ConfigService.php b/lib/Service/ConfigService.php index e3109c0..4b4773a 100644 --- a/lib/Service/ConfigService.php +++ b/lib/Service/ConfigService.php @@ -41,16 +41,9 @@ class ConfigService private $defaults = [ 'configured' => '0', - // 'needed_index' => '2', 'solr_url' => 'http://127.0.0.1:8983/solr/', 'solr_core' => 'nextant', - // 'live_extract' => '1', - // 'live_docupdate' => '0', - // 'last_index' => 0, 'display_result' => 1, - // 'max_size' => 40, - // 'external_index' => '0', - // 'solr_lock' => 0, 'index_locked' => 0, @@ -62,7 +55,7 @@ class ConfigService 'index_files_live_update' => 0, 'index_files_max_size' => 40, - 'index_bookmarks' => 1, + 'index_bookmarks' => 0, 'index_bookmarks_needed' => 1, 'index_bookmarks_last' => 0 ]; diff --git a/templates/settings.admin.php b/templates/settings.admin.php index 066bb99..f28ef90 100644 --- a/templates/settings.admin.php +++ b/templates/settings.admin.php @@ -121,6 +121,7 @@ style('nextant', 'admin'); </tr> --> + <!-- <tr> <td> </td> @@ -131,25 +132,27 @@ style('nextant', 'admin'); </tr> - <tr style="height: 30px;"> <td class="nextant_admin_left"> <?php p($l->t('Index bookmarks :')) ?></td> <td> - <div id="nextant_bookmarks_appdisabled">Bookmarks disabled</div> + <div id="nextant_bookmarks_appdisabled"> + The App <i>Bookmarks</i> is not installed/enabled. + </div> <div id="nextant_bookmarks_appenabled"> <input type="checkbox" name="solr_index_bookmarks" - id="solr_index_bookmarks" value="1" style="margin: 10px;"> + id="solr_index_bookmarks" value="1" style="margin: 10px;"> </div> </td> </tr> + --> <tr> <td> </td> </tr> <tr class="nextant_admin_head"> - <td></td> + <td><div id="nextant_saving">Saving</div></td> <td class="nextant_admin_head">Nextant Status</td> </tr> |