Merge pull request #913 from owncloud/fix_settings

cleaning up the settings
This commit is contained in:
Frank Karlitschek 2012-12-18 15:27:52 -08:00
commit 7c5150ce32
7 changed files with 37 additions and 38 deletions

View File

@ -15,11 +15,11 @@
<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>'
title="<?php echo $l->t( '0 is unlimited' ); ?>"
<?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> />
<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
<?php if (!$_['allowZipDownload']): ?> disabled="disabled"<?php endif; ?> /><br />
<em><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </em><br />
<input type="hidden" value="<?php echo $_['requesttoken']; ?>" name="requesttoken" />
<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings"
value="<?php echo $l->t( 'Save' ); ?>"/>
</fieldset>
</form>
</form>

View File

@ -1,14 +1,14 @@
<form id="calendar">
<fieldset class="personalblock">
<strong><?php echo $l->t('Encryption'); ?></strong>
<?php echo $l->t('Exclude the following file types from encryption'); ?>
<legend><strong><?php echo $l->t('Encryption');?></strong></legend>
<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
id='enable_encryption' ></input>
<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label><br />
<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
<?php foreach ($_['blacklist'] as $type): ?>
<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
<?php endforeach;?>
</select>
<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
id='enable_encryption' ></input>
<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
</select><br />
<?php echo $l->t('Exclude the following file types from encryption'); ?>
</fieldset>
</form>

View File

@ -127,19 +127,14 @@
</fieldset>
</form>
<?php if ( ! $_['isAdminPage']): ?>
<form id="files_external"
method="post"
enctype="multipart/form-data"
action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
<fieldset class="personalblock">
<?php if ( ! $_['isAdminPage']): ?>
<legend><strong><?php echo $l->t('SSL root certificates');?></strong></legend>
<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
<thead>
<tr>
<th><?php echo $l->t('SSL root certificates'); ?></th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody width="100%">
<?php foreach ($_['certs'] as $rootCert): ?>
<tr id="<?php echo $rootCert ?>">
@ -156,6 +151,6 @@
</table>
<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
<?php endif; ?>
</fieldset>
</form>
<?php endif; ?>

View File

@ -3,12 +3,10 @@
<legend>
<strong><?php echo $l->t('Versions'); ?></strong>
</legend>
<p>
<?php echo $l->t('This will delete all existing backup versions of your files'); ?>
</p>
<button id="expireAllBtn">
<?php echo $l->t('Expire all versions'); ?>
<img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
</button>
</button>
<br /><em><?php echo $l->t('This will delete all existing backup versions of your files'); ?></em>
</fieldset>
</form>

View File

@ -1,7 +1,8 @@
<form id="webdavauth" action="#" method="post">
<fieldset class="personalblock">
<legend><strong>WebDAV Authentication</strong></legend>
<p><label for="webdav_url"><?php echo $l->t('WebDAV URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
<p><label for="webdav_url"><?php echo $l->t('URL: http://');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
<input type="submit" value="Save" />
<br /><?php echo $l->t('ownCloud will send the user credentials to this URL is interpret http 401 and http 403 as credentials wrong and all other codes as credentials correct.'); ?>
</fieldset>
</form>

View File

@ -100,7 +100,7 @@ if(!$_['internetconnectionworking']) {
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Log');?></strong></legend>
Log level: <select name='loglevel' id='loglevel'>
<?php echo $l->t('Log level');?> <select name='loglevel' id='loglevel'>
<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
<?php for($i=0;$i<5;$i++):
if($i!=$_['loglevel']):?>
@ -133,8 +133,9 @@ if(!$_['internetconnectionworking']) {
</fieldset>
<p class="personalblock">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Version');?></strong></legend>
<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
</p>
</fieldset>

View File

@ -8,26 +8,29 @@
<p id="quotatext"><?php echo $l->t('You have used <strong>%s</strong> of the available <strong>%s</strong>', array($_['usage'], $_['total_space']));?></p>
</div></div>
<div class="personalblock">
<?php echo $l->t('Desktop and Mobile Syncing Clients');?>
<a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download');?></a>
</div>
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Clients');?></strong></legend>
<a class="button" href="http://owncloud.org/sync-clients/" target="_blank"><?php echo $l->t('Download Desktop Clients');?></a>
<a class="button" href="https://play.google.com/store/apps/details?id=com.owncloud.android" target="_blank"><?php echo $l->t('Download Android Client');?></a>
<a class="button" href="https://itunes.apple.com/us/app/owncloud/id543672169?mt=8" target="_blank"><?php echo $l->t('Download iOS Client');?></a>
</fieldset>
<form id="passwordform">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Password');?></strong></legend>
<div id="passwordchanged"><?php echo $l->t('Your password was changed');?></div>
<div id="passworderror"><?php echo $l->t('Unable to change your password');?></div>
<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t('Current password');?>" />
<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t('New password');?>" data-typetoggle="#show" />
<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t('show');?></label>
<input type="checkbox" id="show" name="show" /><label for="show"> <?php echo $l->t('show');?></label>
<input id="passwordbutton" type="submit" value="<?php echo $l->t('Change password');?>" />
</fieldset>
</form>
<form id="lostpassword">
<fieldset class="personalblock">
<label for="email"><strong><?php echo $l->t('Email');?></strong></label>
<legend><strong><?php echo $l->t('Email');?></strong></legend>
<input type="text" name="email" id="email" value="<?php echo $_['email']; ?>" placeholder="<?php echo $l->t('Your email address');?>" /><span class="msg"></span><br />
<em><?php echo $l->t('Fill in an email address to enable password recovery');?></em>
</fieldset>
@ -35,7 +38,7 @@
<form>
<fieldset class="personalblock">
<label for="languageinput"><strong><?php echo $l->t('Language');?></strong></label>
<legend><strong><?php echo $l->t('Language');?></strong></legend>
<select id="languageinput" class="chzen-select" name="lang" data-placeholder="<?php echo $l->t('Language');?>">
<?php foreach($_['languages'] as $language):?>
<option value="<?php echo $language['code'];?>"><?php echo $language['name'];?></option>
@ -45,20 +48,21 @@
</fieldset>
</form>
<p class="personalblock">
<strong>WebDAV</strong>
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('WebDAV');?></strong></legend>
<code><?php echo OC_Helper::linkToRemote('webdav'); ?></code><br />
<em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
</p>
<em><?php echo $l->t('Use this address to connect to your ownCloud in your file manager');?></em>
</fieldset>
<?php foreach($_['forms'] as $form) {
echo $form;
};?>
<p class="personalblock">
<fieldset class="personalblock">
<legend><strong><?php echo $l->t('Version');?></strong></legend>
<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> <br />
<?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/owncloud" target="_blank">source code</a> is licensed under the <a href="http://www.gnu.org/licenses/agpl-3.0.html" target="_blank"><abbr title="Affero General Public License">AGPL</abbr></a>.'); ?>
</p>
</fieldset>