summaryrefslogtreecommitdiffstats
path: root/settings
diff options
context:
space:
mode:
Diffstat (limited to 'settings')
-rw-r--r--settings/admin.php2
-rw-r--r--settings/apps.php5
-rw-r--r--settings/css/settings.css3
-rw-r--r--settings/js/users.js12
-rw-r--r--settings/templates/admin.php2
-rw-r--r--settings/templates/help.php6
-rw-r--r--settings/templates/users.php110
7 files changed, 85 insertions, 55 deletions
diff --git a/settings/admin.php b/settings/admin.php
index a997bad4e3c..4cbd67c3678 100644
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -23,7 +23,7 @@ function compareEntries($a,$b){
usort($entries, 'compareEntries');
$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('entries',$entries);
+$tmpl->assign('entries',$entries,false);
$tmpl->assign('forms',array());
foreach($forms as $form){
$tmpl->append('forms',$form);
diff --git a/settings/apps.php b/settings/apps.php
index 1a829d371a6..f85b28158f5 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -63,7 +63,8 @@ usort($apps, 'app_sort');
$catagoryNames=OC_OCSClient::getCategories();
if(is_array($catagoryNames)){
$categories=array_keys($catagoryNames);
- $externalApps=OC_OCSClient::getApplications($categories);
+ $page=0;
+ $externalApps=OC_OCSClient::getApplications($categories,$page);
foreach($externalApps as $app){
// show only external apps that are not exist yet
$local=false;
@@ -91,7 +92,7 @@ usort($apps, 'app_sort');
$tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps',$apps);
+$tmpl->assign('apps',$apps, false);
$tmpl->printPage();
diff --git a/settings/css/settings.css b/settings/css/settings.css
index b5a3c0f03b7..df1e3cfd3c2 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -34,9 +34,10 @@ li.selected { background-color:#ddd; }
#content>table:not(.nostyle) { margin-top:3em; }
table:not(.nostyle) { width:100%; }
#rightcontent { padding-left: 1em; }
-td.quota { position:absolute; }
div.quota { float:right; display:block; position:absolute; right:25em; top:0; }
+div.quota-select-wrapper { position: relative; }
select.quota { position:absolute; left:0; top:0; width:10em; }
+select.quota-user { position:relative; left:0; top:0; width:10em; }
input.quota-other { display:none; position:absolute; left:0.1em; top:0.1em; width:7em; border:none; -webkit-box-shadow: none -mox-box-shadow:none ; box-shadow:none; }
div.quota>span { position:absolute; right:0em; white-space:nowrap; top: 0.7em }
select.quota.active { background: #fff; }
diff --git a/settings/js/users.js b/settings/js/users.js
index 7c3c3d37b18..f173357749e 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -95,9 +95,9 @@ $(document).ready(function(){
$(this).children('img').click();
});
- $('select.quota').live('change',function(){
+ $('select.quota, select.quota-user').live('change',function(){
var select=$(this);
- var uid=$(this).parent().parent().data('uid');
+ var uid=$(this).parent().parent().parent().data('uid');
var quota=$(this).val();
var other=$(this).next();
if(quota!='other'){
@@ -110,7 +110,7 @@ $(document).ready(function(){
other.focus();
}
});
- $('select.quota').each(function(i,select){
+ $('select.quota, select.quota-user').each(function(i,select){
$(select).data('previous',$(select).val());
})
@@ -207,9 +207,9 @@ $(document).ready(function(){
applyMultiplySelect(select);
$('#content table tbody').last().append(tr);
- tr.find('select.quota option').attr('selected',null);
- tr.find('select.quota option').first().attr('selected','selected');
- tr.find('select.quota').data('previous','default');
+ tr.find('select.quota-user option').attr('selected',null);
+ tr.find('select.quota-user option').first().attr('selected','selected');
+ tr.find('select.quota-user').data('previous','default');
}
}
);
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d167f2780ef..38c6042c82a 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -29,7 +29,7 @@ $levels=array('Debug','Info','Warning','Error','Fatal');
<?php echo $entry->app;?>
</td>
<td>
- <?php echo htmlentities($entry->message);?>
+ <?php echo $entry->message;?>
</td>
<td>
<?php echo OC_Util::formatDate($entry->time);?>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index cf61207e601..a53ec76d681 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -26,9 +26,9 @@
<?php foreach($_["kbe"] as $kb): ?>
<div class="helpblock">
<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
- <?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.htmlentities($kb["name"]).'</strong></a></p>');?>
- <p><?php echo htmlentities($kb['description']);?></p>
- <?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.htmlentities($kb['answer']).'</p>');?>
+ <?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
+ <p><?php echo $kb['description'];?></p>
+ <?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
</div>
<?php endforeach;
endif?>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index a23a5bafe61..ea3fe777ffe 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -12,29 +12,43 @@ foreach($_["groups"] as $group) {
<div id="controls">
<form id="newuser">
- <input id="newusername" placeholder="<?php echo $l->t('Name')?>" />
- <input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" />
- <select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
- <?php foreach($_["groups"] as $group): ?>
- <option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
- <?php endforeach;?>
- </select>
- <input type="submit" value="<?php echo $l->t('Create')?>" />
+ <input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
+ type="password" id="newuserpassword"
+ placeholder="<?php echo $l->t('Password')?>" /> <select
+ id="newusergroups" data-placeholder="groups"
+ title="<?php echo $l->t('Groups')?>" multiple="multiple">
+ <?php foreach($_["groups"] as $group): ?>
+ <option value="<?php echo $group['name'];?>">
+ <?php echo $group['name'];?>
+ </option>
+ <?php endforeach;?>
+ </select> <input type="submit" value="<?php echo $l->t('Create')?>" />
</form>
<div class="quota">
<span><?php echo $l->t('Default Quota');?>:</span>
- <select class='quota'>
- <?php foreach($_['quota_preset'] as $preset):?>
+ <div class="quota-select-wrapper">
+ <select class='quota'>
+ <?php foreach($_['quota_preset'] as $preset):?>
<?php if($preset!='default'):?>
- <option <?php if($_['default_quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
+ <option
+ <?php if($_['default_quota']==$preset) echo 'selected="selected"';?>
+ value='<?php echo $preset;?>'>
+ <?php echo $preset;?>
+ </option>
<?php endif;?>
- <?php endforeach;?>
- <?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
- <option selected="selected" value='<?php echo $_['default_quota'];?>'><?php echo $_['default_quota'];?></option>
- <?php endif;?>
- <option value='other'><?php echo $l->t('Other');?>...</option>
- </select>
- <input class='quota-other'></input>
+ <?php endforeach;?>
+ <?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
+ <option selected="selected"
+ value='<?php echo $_['default_quota'];?>'>
+ <?php echo $_['default_quota'];?>
+ </option>
+ <?php endif;?>
+ <option value='other'>
+ <?php echo $l->t('Other');?>
+ ...
+ </option>
+ </select> <input class='quota-other'></input>
+ </div>
</div>
</div>
@@ -49,38 +63,52 @@ foreach($_["groups"] as $group) {
</tr>
</thead>
<tbody>
- <?php foreach($_["users"] as $user): ?>
+ <?php foreach($_["users"] as $user): ?>
<tr data-uid="<?php echo $user["name"] ?>">
<td class="name"><?php echo $user["name"]; ?></td>
- <td class="password">
- <span>●●●●●●●</span>
- <img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set new password" />
+ <td class="password"><span>●●●●●●●</span> <img class="svg action"
+ src="<?php echo image_path('core','actions/rename.svg')?>"
+ alt="set new password" title="set new password" />
</td>
- <td class="groups">
- <select data-username="<?php echo $user['name'] ;?>" data-user-groups="<?php echo $user['groups'] ;?>" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
+ <td class="groups"><select
+ data-username="<?php echo $user['name'] ;?>"
+ data-user-groups="<?php echo $user['groups'] ;?>"
+ data-placeholder="groups" title="<?php echo $l->t('Groups')?>"
+ multiple="multiple">
<?php foreach($_["groups"] as $group): ?>
- <option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
+ <option value="<?php echo $group['name'];?>">
+ <?php echo $group['name'];?>
+ </option>
<?php endforeach;?>
- </select>
+ </select>
</td>
<td class="quota">
- <select class='quota'>
- <?php foreach($_['quota_preset'] as $preset):?>
- <option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option>
- <?php endforeach;?>
- <?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
- <option selected="selected" value='<?php echo $user['quota'];?>'><?php echo $user['quota'];?></option>
- <?php endif;?>
- <option value='other'><?php echo $l->t('Other');?>...</option>
- </select>
- <input class='quota-other'></input>
+ <div class="quota-select-wrapper">
+ <select class='quota-user'>
+ <?php foreach($_['quota_preset'] as $preset):?>
+ <option
+ <?php if($user['quota']==$preset) echo 'selected="selected"';?>
+ value='<?php echo $preset;?>'>
+ <?php echo $preset;?>
+ </option>
+ <?php endforeach;?>
+ <?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
+ <option selected="selected" value='<?php echo $user['quota'];?>'>
+ <?php echo $user['quota'];?>
+ </option>
+ <?php endif;?>
+ <option value='other'>
+ <?php echo $l->t('Other');?>
+ ...
+ </option>
+ </select> <input class='quota-other'></input>
+ </div>
</td>
- <td class="remove">
- <?php if($user['name']!=OC_User::getUser()):?>
- <img alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" />
- <?php endif;?>
+ <td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
+ alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
+ src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
</td>
</tr>
- <?php endforeach; ?>
+ <?php endforeach; ?>
</tbody>
</table>
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-10 11:43:59 +0000