diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-11 20:27:05 -0500 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-02-11 20:27:05 -0500 |
| commit | 6eba790a75ba128e3182771a30dbe88733ee0dfc (patch) | |
| tree | ba313bec694c64928d82e2b76445d6307a305b22 /apps/files_external/templates | |
| parent | 6f08b1f829e9d4c49f66b19fdda8c229bc8ae3f3 (diff) | |
| parent | 04bf8c1b66d6adef0466efae00c32745465767f2 (diff) | |
| download | nextcloud-server-6eba790a75ba128e3182771a30dbe88733ee0dfc.tar.gz nextcloud-server-6eba790a75ba128e3182771a30dbe88733ee0dfc.zip | |
Merge branch 'master' into external_storage_ui_feedback
Conflicts:
apps/files_external/js/dropbox.js
apps/files_external/js/google.js
apps/files_external/js/settings.js
apps/files_external/lib/amazons3.php
apps/files_external/lib/dropbox.php
apps/files_external/lib/google.php
apps/files_external/lib/smb.php
apps/files_external/lib/swift.php
apps/files_external/lib/webdav.php
lib/filestorage.php
Diffstat (limited to 'apps/files_external/templates')
| -rw-r--r-- | apps/files_external/templates/settings.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php index 62bbf3a5ae1..c6025aa0ffe 100644 --- a/apps/files_external/templates/settings.php +++ b/apps/files_external/templates/settings.php @@ -1,7 +1,7 @@ <form id="files_external"> <fieldset class="personalblock"> <legend><strong><?php echo $l->t('External Storage'); ?></strong></legend> - <?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?> + <?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?> <table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'> <thead> <tr> @@ -53,7 +53,7 @@ <?php elseif (strpos($placeholder, '!') !== false): ?> <label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" - <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?> + <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?> /><?php echo substr($placeholder, 1); ?></label> <?php elseif (strpos($placeholder, '&') !== false): ?> <input type="text" @@ -110,7 +110,7 @@ <?php endif; ?> <td <?php if ($mountPoint != ''): ?>class="remove" <?php else: ?>style="visibility:hidden;" - <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>" + <?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td> |