]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #12213 from sebomoto/add-loadfeedback
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 18 Feb 2015 18:42:18 +0000 (19:42 +0100)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 18 Feb 2015 18:42:18 +0000 (19:42 +0100)
Add loadfeedback

1  2 
core/css/styles.css
core/js/setup.js
core/templates/installation.php

Simple merge
Simple merge
index 4e9cde205d833be2958d5418b13b353c993c38f8,c08cfa22cdebedcf0c05f3b3802682784c1add40..f8311fed0093b4e666188db5905b1f95d3c114e0
@@@ -145,14 -146,11 +145,16 @@@ script('core', 
                </fieldset>
                <?php endif; ?>
        <?php endif; ?>
+       
+       <div class="icon-loading-dark float-spinner">&nbsp;</div>
  
        <?php if(!$_['dbIsSet'] OR count($_['errors']) > 0): ?>
 -      <p id="sqliteInformation" class="info"><?php p($l->t('SQLite will be used as database. For larger installations we recommend to change this.'));?></p>
 +              <fieldset id="sqliteInformation" class="warning">
 +                      <legend><?php p($l->t('Performance Warning'));?></legend>
 +                      <p><?php p($l->t('SQLite will be used as database.'));?></p>
 +                      <p><?php p($l->t('For larger installations we recommend to choose a different database backend.'));?></p>
 +                      <p><?php p($l->t('Especially when using the desktop client for file syncing the use of SQLite is discouraged.')); ?></p>
 +              </fieldset>
        <?php endif ?>
  
        <div class="buttons"><input type="submit" class="primary" value="<?php p($l->t( 'Finish setup' )); ?>" data-finishing="<?php p($l->t( 'Finishing …' )); ?>" /></div>