mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4

This commit is contained in:
Arthur Schiwon 2012-06-12 11:57:36 +02:00
parent 266c5238c9 4501407283
commit b70226b493
7 changed files with 90 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -40,6 +40,9 @@ nbproject
# Cloud9IDE # Cloud9IDE
.settings.xml .settings.xml
# vim ex mode
.vimrc
# Mac OS # Mac OS
.DS_Store .DS_Store

16
apps/contacts/js/contacts.js
View File

@ -842,22 +842,22 @@ Contacts={
$('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']); $('#addressdisplay dl').last().data('checksum', this.data.ADR[adr]['checksum']);
var adrarray = this.data.ADR[adr]['value']; var adrarray = this.data.ADR[adr]['value'];
var adrtxt = ''; var adrtxt = '';
if(adrarray[0].length > 0) { if(adrarray[0] && adrarray[0].length > 0) {
adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>'; adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
} }
if(adrarray[1].length > 0) { if(adrarray[1] && adrarray[1].length > 0) {
adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>'; adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
} }
if(adrarray[2].length > 0) { if(adrarray[2] && adrarray[2].length > 0) {
adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>'; adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
} }
if(adrarray[3].length > 0 || adrarray[5].length > 0) { if((adrarray[3] && adrarray[5]) && adrarray[3].length > 0 || adrarray[5].length > 0) {
adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>'; adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
} }
if(adrarray[4].length > 0) { if(adrarray[4] && adrarray[4].length > 0) {
adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>'; adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
} }
if(adrarray[6].length > 0) { if(adrarray[6] && adrarray[6].length > 0) {
adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>'; adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
} }
$('#addressdisplay dl').last().find('.addresslist').html(adrtxt); $('#addressdisplay dl').last().find('.addresslist').html(adrtxt);
@ -1284,8 +1284,8 @@ Contacts={
$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){ $('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
if(jsondata.status != 'error'){ if(jsondata.status != 'error'){
$('#chooseaddressbook_dialog').dialog({ $('#chooseaddressbook_dialog').dialog({
minWidthwidth : 600, minWidth: 600,
close : function(event, ui) { close: function(event, ui) {
$(this).dialog('destroy').remove(); $(this).dialog('destroy').remove();
} }
}).css('overflow','visible'); }).css('overflow','visible');

2
apps/contacts/lib/vcard.php
View File

@ -131,7 +131,7 @@ class OC_Contacts_VCard{
foreach($property->parameters as $key=>&$parameter){ foreach($property->parameters as $key=>&$parameter){
if(strtoupper($parameter->name) == 'ENCODING') { if(strtoupper($parameter->name) == 'ENCODING') {
if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used? if(strtoupper($parameter->value) == 'QUOTED-PRINTABLE') { // what kind of other encodings could be used?
$property->value = quoted_printable_decode($property->value); $property->value = str_replace("\r\n", "\n", mb_convert_encoding(quoted_printable_decode($property->value), 'utf-8', 'auto'));
unset($property->parameters[$key]); unset($property->parameters[$key]);
} }
} elseif(strtoupper($parameter->name) == 'CHARSET') { } elseif(strtoupper($parameter->name) == 'CHARSET') {

4
apps/files/js/fileactions.js
View File

@ -71,7 +71,7 @@ FileActions={
} }
var html='<a href="#" class="action" style="display:none">'; var html='<a href="#" class="action" style="display:none">';
if(img) { html+='<img src="'+img+'"/> '; } if(img) { html+='<img src="'+img+'"/> '; }
html += name+'</a>'; html += t('files', name) +'</a>';
var element=$(html); var element=$(html);
element.data('action',name); element.data('action',name);
element.click(function(event){ element.click(function(event){
@ -91,7 +91,7 @@ FileActions={
if(img.call){ if(img.call){
img=img(file); img=img(file);
} }
var html='<a href="#" original-title="Delete" class="action delete" style="display:none" />'; var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
var element=$(html); var element=$(html);
if(img){ if(img){
element.append($('<img src="'+img+'"/>')); element.append($('<img src="'+img+'"/>'));

2
settings/css/settings.css
View File

@ -34,8 +34,8 @@ li.selected { background-color:#ddd; }
#content>table:not(.nostyle) { margin-top:3em; } #content>table:not(.nostyle) { margin-top:3em; }
table:not(.nostyle) { width:100%; } table:not(.nostyle) { width:100%; }
#rightcontent { padding-left: 1em; } #rightcontent { padding-left: 1em; }
td.quota { position:relative; }
div.quota { float:right; display:block; position:absolute; right:25em; top:0; } 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 { position:absolute; left:0; top:0; width:10em; }
select.quota-user { position:relative; 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; } 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; }

12
settings/js/users.js
View File

@ -95,9 +95,9 @@ $(document).ready(function(){
$(this).children('img').click(); $(this).children('img').click();
}); });
$('select.quota').live('change',function(){ $('select.quota, select.quota-user').live('change',function(){
var select=$(this); var select=$(this);
var uid=$(this).parent().parent().data('uid'); var uid=$(this).parent().parent().parent().data('uid');
var quota=$(this).val(); var quota=$(this).val();
var other=$(this).next(); var other=$(this).next();
if(quota!='other'){ if(quota!='other'){
@ -110,7 +110,7 @@ $(document).ready(function(){
other.focus(); other.focus();
} }
}); });
$('select.quota').each(function(i,select){ $('select.quota, select.quota-user').each(function(i,select){
$(select).data('previous',$(select).val()); $(select).data('previous',$(select).val());
}) })
@ -207,9 +207,9 @@ $(document).ready(function(){
applyMultiplySelect(select); applyMultiplySelect(select);
$('#content table tbody').last().append(tr); $('#content table tbody').last().append(tr);
tr.find('select.quota option').attr('selected',null); tr.find('select.quota-user option').attr('selected',null);
tr.find('select.quota option').first().attr('selected','selected'); tr.find('select.quota-user option').first().attr('selected','selected');
tr.find('select.quota').data('previous','default'); tr.find('select.quota-user').data('previous','default');
} }
} }
); );

110
settings/templates/users.php
View File

@ -12,29 +12,43 @@ foreach($_["groups"] as $group) {
<div id="controls"> <div id="controls">
<form id="newuser"> <form id="newuser">
<input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input id="newusername" placeholder="<?php echo $l->t('Name')?>" /> <input
<input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" /> type="password" id="newuserpassword"
<select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple"> placeholder="<?php echo $l->t('Password')?>" /> <select
<?php foreach($_["groups"] as $group): ?> id="newusergroups" data-placeholder="groups"
<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option> title="<?php echo $l->t('Groups')?>" multiple="multiple">
<?php endforeach;?> <?php foreach($_["groups"] as $group): ?>
</select> <option value="<?php echo $group['name'];?>">
<input type="submit" value="<?php echo $l->t('Create')?>" /> <?php echo $group['name'];?>
</option>
<?php endforeach;?>
</select> <input type="submit" value="<?php echo $l->t('Create')?>" />
</form> </form>
<div class="quota"> <div class="quota">
<span><?php echo $l->t('Default Quota');?>:</span> <span><?php echo $l->t('Default Quota');?>:</span>
<select class='quota'> <div class="quota-select-wrapper">
<?php foreach($_['quota_preset'] as $preset):?> <select class='quota'>
<?php foreach($_['quota_preset'] as $preset):?>
<?php if($preset!='default'):?> <?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 endif;?>
<?php endforeach;?> <?php endforeach;?>
<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?> <?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
<option selected="selected" value='<?php echo $_['default_quota'];?>'><?php echo $_['default_quota'];?></option> <option selected="selected"
<?php endif;?> value='<?php echo $_['default_quota'];?>'>
<option value='other'><?php echo $l->t('Other');?>...</option> <?php echo $_['default_quota'];?>
</select> </option>
<input class='quota-other'></input> <?php endif;?>
<option value='other'>
<?php echo $l->t('Other');?>
...
</option>
</select> <input class='quota-other'></input>
</div>
</div> </div>
</div> </div>
@ -49,38 +63,52 @@ foreach($_["groups"] as $group) {
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php foreach($_["users"] as $user): ?> <?php foreach($_["users"] as $user): ?>
<tr data-uid="<?php echo $user["name"] ?>"> <tr data-uid="<?php echo $user["name"] ?>">
<td class="name"><?php echo $user["name"]; ?></td> <td class="name"><?php echo $user["name"]; ?></td>
<td class="password"> <td class="password"><span>●●●●●●●</span> <img class="svg action"
<span>●●●●●●●</span> src="<?php echo image_path('core','actions/rename.svg')?>"
<img class="svg action" src="<?php echo image_path('core','actions/rename.svg')?>" alt="set new password" title="set new password" /> alt="set new password" title="set new password" />
</td> </td>
<td class="groups"> <td class="groups"><select
<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"> 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): ?> <?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;?> <?php endforeach;?>
</select> </select>
</td> </td>
<td class="quota"> <td class="quota">
<select class='quota-user'> <div class="quota-select-wrapper">
<?php foreach($_['quota_preset'] as $preset):?> <select class='quota-user'>
<option <?php if($user['quota']==$preset) echo 'selected="selected"';?> value='<?php echo $preset;?>'><?php echo $preset;?></option> <?php foreach($_['quota_preset'] as $preset):?>
<?php endforeach;?> <option
<?php if(array_search($user['quota'],$_['quota_preset'])===false):?> <?php if($user['quota']==$preset) echo 'selected="selected"';?>
<option selected="selected" value='<?php echo $user['quota'];?>'><?php echo $user['quota'];?></option> value='<?php echo $preset;?>'>
<?php endif;?> <?php echo $preset;?>
<option value='other'><?php echo $l->t('Other');?>...</option> </option>
</select> <?php endforeach;?>
<input class='quota-other'></input> <?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>
<td class="remove"> <td class="remove"><?php if($user['name']!=OC_User::getUser()):?> <img
<?php if($user['name']!=OC_User::getUser()):?> alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action"
<img alt="Delete" title="<?php echo $l->t('Delete')?>" class="svg action" src="<?php echo image_path('core','actions/delete.svg') ?>" /> src="<?php echo image_path('core','actions/delete.svg') ?>" /> <?php endif;?>
<?php endif;?>
</td> </td>
</tr> </tr>
<?php endforeach; ?> <?php endforeach; ?>
</tbody> </tbody>
</table> </table>