fix paths to images and set height for calendar management dialog

diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
index 80b5dd88c5ed81567cc056245a39808d418e05b8..f50d0bd0092f536b1441be2980c4db00d66efa85 100644 (file)
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -379,6 +379,7 @@ Calendar={
                                        $('#dialog_holder').load(OC.filePath('calendar', 'ajax/calendar', 'overview.php'), function(){
                                                $('#choosecalendar_dialog').dialog({
                                                        width : 600,
+                                                       height: 400,
                                                        close : function(event, ui) {
                                                                $(this).dialog('destroy').remove();
                                                        }
@@ -543,7 +544,7 @@ Calendar={
                                $('#share_user').live('change', function(){
                                        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');
-                                               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_' + $('#share_user option:selected').text() + ' > img').click(function(){
                                                        $('#share_user option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');
@@ -558,7 +559,7 @@ Calendar={
                                $('#share_group').live('change', function(){
                                        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');
-                                               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_' + $('#share_group option:selected').text() + ' > img').click(function(){
                                                        $('#share_group option[value="' + $(this).parent().text() + '"]').removeAttr('disabled');

diff --git a/apps/calendar/templates/part.choosecalendar.php b/apps/calendar/templates/part.choosecalendar.php
index a140316ea07863ab96c7173ed0d22a998cdfaba1..8d621cc3630a5e1b6ca554f4ed85acd82cd2cf09 100644 (file)
--- a/apps/calendar/templates/part.choosecalendar.php
+++ b/apps/calendar/templates/part.choosecalendar.php
@@ -24,7 +24,7 @@ for($i = 0; $i < count($option_calendars); $i++){
 </tr>
 <tr>
        <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>
 </tr>
 </table><br>

diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
index 20d4c19bc19ea1c4fa9d0a301186b7837ed9f657..07b4c4bced5811b04473a09df0239064d6418ea2 100644 (file)
--- a/apps/calendar/templates/share.dropdown.php
+++ b/apps/calendar/templates/share.dropdown.php
@@ -63,7 +63,7 @@ echo OCP\html_select_options($allgroups, array());
        <script>
                $('#sharewithgroup_<?php echo $group['share']; ?> > img').click(function(){
                        $('#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();
                        $("#share_group").trigger("liszt:updated");
                });