diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-02-27 07:12:50 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-02-27 07:12:50 -0800 |
| commit | fed39d0db2ef547c212eeadc46887f4089a1863e (patch) | |
| tree | 781b11f29028f26db15a65c382a38c43fc7752c8 | |
| parent | 5fd8d155fd8ebdffeb03ed6720f3ae31af117827 (diff) | |
| parent | f8bcd38d4d03c38a79359cd59114b126b99427af (diff) | |
| download | nextcloud-server-fed39d0db2ef547c212eeadc46887f4089a1863e.tar.gz nextcloud-server-fed39d0db2ef547c212eeadc46887f4089a1863e.zip | |
Merge pull request #1964 from owncloud/versions_cleanup
Versions cleanup
| -rw-r--r-- | apps/files_versions/ajax/togglesettings.php | 10 | ||||
| -rw-r--r-- | apps/files_versions/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/js/versions.js | 14 | ||||
| -rw-r--r-- | apps/files_versions/settings.php | 9 | ||||
| -rw-r--r-- | apps/files_versions/templates/settings.php | 9 |
5 files changed, 2 insertions, 42 deletions
diff --git a/apps/files_versions/ajax/togglesettings.php b/apps/files_versions/ajax/togglesettings.php deleted file mode 100644 index 546b37ae1aa..00000000000 --- a/apps/files_versions/ajax/togglesettings.php +++ /dev/null @@ -1,10 +0,0 @@ -<?php - -OCP\JSON::checkAppEnabled('files_versions'); -OCP\JSON::checkAdminUser(); -OCP\JSON::callCheck(); -if (OCP\Config::getSystemValue('versions', 'true')=='true') { - OCP\Config::setSystemValue('versions', 'false'); -} else { - OCP\Config::setSystemValue('versions', 'true'); -} diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php index 8e0356ada20..ae48b0cc10a 100644 --- a/apps/files_versions/appinfo/app.php +++ b/apps/files_versions/appinfo/app.php @@ -4,8 +4,6 @@ OC::$CLASSPATH['OCA\Files_Versions\Storage'] = 'apps/files_versions/lib/versions.php'; OC::$CLASSPATH['OCA\Files_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php'; -OCP\App::registerAdmin('files_versions', 'settings'); - OCP\Util::addscript('files_versions', 'versions'); // Listen to write signals diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index 109829fa03f..b82b9001fdb 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -1,19 +1,9 @@ -$(document).ready(function() { - $('#versions').bind('change', function() { - var checked = 1; - if (!this.checked) { - checked = 0; - } - $.post(OC.filePath('files_versions','ajax','togglesettings.php'), 'versions='+checked); - }); -}); - $(document).ready(function(){ if (typeof FileActions !== 'undefined') { - // Add history button to 'files/index.php' + // Add versions button to 'files/index.php' FileActions.register( 'file' - , t('files_versions', 'History') + , t('files_versions', 'Versions') , OC.PERMISSION_UPDATE , function() { // Specify icon for hitory button diff --git a/apps/files_versions/settings.php b/apps/files_versions/settings.php deleted file mode 100644 index f2873b8f7c2..00000000000 --- a/apps/files_versions/settings.php +++ /dev/null @@ -1,9 +0,0 @@ -<?php - -OCP\User::checkAdminUser(); - -OCP\Util::addscript( 'files_versions', 'versions' ); - -$tmpl = new OCP\Template( 'files_versions', 'settings'); - -return $tmpl->fetchPage(); diff --git a/apps/files_versions/templates/settings.php b/apps/files_versions/templates/settings.php deleted file mode 100644 index 3b8e4baf119..00000000000 --- a/apps/files_versions/templates/settings.php +++ /dev/null @@ -1,9 +0,0 @@ -<form id="versionssettings"> - <fieldset class="personalblock"> - <legend><strong><?php echo $l->t('Files Versioning');?></strong></legend> - <input type="checkbox" name="versions" id="versions" value="1" - <?php if (OCP\Config::getSystemValue('versions', 'true')=='true') - echo ' checked="checked"'; - ?> /> <label for="versions"><?php echo $l->t('Enable'); ?></label> <br/> - </fieldset> -</form> |