fix paths to images and set height for calendar management dialog
This commit is contained in:
parent
57d41bb1f8
commit
6146b6a131
|
@ -379,6 +379,7 @@ Calendar={
|
||||||
$('#dialog_holder').load(OC.filePath('calendar', 'ajax/calendar', 'overview.php'), function(){
|
$('#dialog_holder').load(OC.filePath('calendar', 'ajax/calendar', 'overview.php'), function(){
|
||||||
$('#choosecalendar_dialog').dialog({
|
$('#choosecalendar_dialog').dialog({
|
||||||
width : 600,
|
width : 600,
|
||||||
|
height: 400,
|
||||||
close : function(event, ui) {
|
close : function(event, ui) {
|
||||||
$(this).dialog('destroy').remove();
|
$(this).dialog('destroy').remove();
|
||||||
}
|
}
|
||||||
|
@ -543,7 +544,7 @@ Calendar={
|
||||||
$('#share_user').live('change', function(){
|
$('#share_user').live('change', function(){
|
||||||
if($('#sharewithuser_' + $('#share_user option:selected').text()).length == 0){
|
if($('#sharewithuser_' + $('#share_user option:selected').text()).length == 0){
|
||||||
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_user option:selected').text(), 'user');
|
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_user option:selected').text(), 'user');
|
||||||
var newitem = '<li id="sharewithuser_' + $('#share_user option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_user option:selected').text() + '">' + $('#share_user option:selected').text() + '<img src="/owncloud/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
|
var newitem = '<li id="sharewithuser_' + $('#share_user option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_user option:selected').text() + '">' + $('#share_user option:selected').text() + '<img src="' + oc_webroot + '/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
|
||||||
$('#sharewithuser_list').append(newitem);
|
$('#sharewithuser_list').append(newitem);
|
||||||
$('#sharewithuser_' + $('#share_user option:selected').text() + ' > img').click(function(){
|
$('#sharewithuser_' + $('#share_user option:selected').text() + ' > img').click(function(){
|
||||||
$('#share_user option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
$('#share_user option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
||||||
|
@ -558,7 +559,7 @@ Calendar={
|
||||||
$('#share_group').live('change', function(){
|
$('#share_group').live('change', function(){
|
||||||
if($('#sharewithgroup_' + $('#share_group option:selected').text()).length == 0){
|
if($('#sharewithgroup_' + $('#share_group option:selected').text()).length == 0){
|
||||||
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_group option:selected').text(), 'group');
|
Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $('#share_group option:selected').text(), 'group');
|
||||||
var newitem = '<li id="sharewithgroup_' + $('#share_group option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_group option:selected').text() + '">' + $('#share_group option:selected').text() + '<img src="/owncloud/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
|
var newitem = '<li id="sharewithgroup_' + $('#share_group option:selected').text() +'"><input type="checkbox" width="12px" style="visibility:hidden;" title="' + $('#share_group option:selected').text() + '">' + $('#share_group option:selected').text() + '<img src="' + oc_webroot + '/core/img/actions/delete.svg" class="svg action" style="display:none;float:right;"></li>';
|
||||||
$('#sharewithgroup_list').append(newitem);
|
$('#sharewithgroup_list').append(newitem);
|
||||||
$('#sharewithgroup_' + $('#share_group option:selected').text() + ' > img').click(function(){
|
$('#sharewithgroup_' + $('#share_group option:selected').text() + ' > img').click(function(){
|
||||||
$('#share_group option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
$('#share_group option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
|
||||||
|
|
|
@ -24,7 +24,7 @@ for($i = 0; $i < count($option_calendars); $i++){
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td colspan="6">
|
<td colspan="6">
|
||||||
<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="$('#caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="../../core/img/actions/delete.svg" alt="close" onclick="$('#caldav_url').hide();$('#caldav_url_close').hide();"/></p>
|
<p style="margin: 0 auto;width: 90%;"><input style="display:none;width: 90%;float: left;" type="text" id="caldav_url" onmouseover="$('#caldav_url').select();" title="<?php echo $l->t("CalDav Link"); ?>"><img id="caldav_url_close" style="height: 20px;vertical-align: middle;display: none;" src="<?php echo OCP\Util::imagePath('core', 'actions/delete.svg') ?>" alt="close" onclick="$('#caldav_url').hide();$('#caldav_url_close').hide();"/></p>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
</table><br>
|
</table><br>
|
||||||
|
|
|
@ -63,7 +63,7 @@ echo OCP\html_select_options($allgroups, array());
|
||||||
<script>
|
<script>
|
||||||
$('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
|
$('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
|
||||||
$('#share_group option[value="<?php echo $group['share']; ?>"]').removeAttr('disabled');
|
$('#share_group option[value="<?php echo $group['share']; ?>"]').removeAttr('disabled');
|
||||||
Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>, '<?php echo $group['share']; ?>', 'group'); ?>
|
Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>', '<?php echo $group['share']; ?>', 'group');
|
||||||
$('#sharewithgroup_<?php echo $group['share']; ?>').remove();
|
$('#sharewithgroup_<?php echo $group['share']; ?>').remove();
|
||||||
$("#share_group").trigger("liszt:updated");
|
$("#share_group").trigger("liszt:updated");
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue