diff options
Diffstat (limited to 'settings/templates')
-rw-r--r-- | settings/templates/admin.php | 2 | ||||
-rw-r--r-- | settings/templates/help.php | 6 | ||||
-rw-r--r-- | settings/templates/users.php | 110 |
3 files changed, 73 insertions, 45 deletions
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> |