@jancborchardt's Share via link suggestion: move to bottom of share dialogue implemented; minor style fixes; disclaimer about sharing visibility added
parent
ebb5b62b08
commit
8c6e80d2c7
|
@ -47,6 +47,7 @@
|
||||||
transition:max-height ease-out 1s/*, opacity ease-out 0.5s*/;
|
transition:max-height ease-out 1s/*, opacity ease-out 0.5s*/;
|
||||||
opacity:0.5;
|
opacity:0.5;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* a hidden control checkbox should be hidden */
|
/* a hidden control checkbox should be hidden */
|
||||||
.displayable-container > .displayable-control.hide {
|
.displayable-container > .displayable-control.hide {
|
||||||
display:none;
|
display:none;
|
||||||
|
@ -87,11 +88,16 @@
|
||||||
}
|
}
|
||||||
/* shared-with list */
|
/* shared-with list */
|
||||||
.shared-with-list {
|
.shared-with-list {
|
||||||
padding:0.5em 0em;
|
padding:0em;
|
||||||
}
|
}
|
||||||
.shared-with-list > li {
|
.shared-with-list > li {
|
||||||
text-align:right;
|
text-align:right;
|
||||||
|
margin:0.5em 0em -0.5em 0em;
|
||||||
}
|
}
|
||||||
|
.shared-with-list > li:last-child {
|
||||||
|
margin-bottom:0.5em;
|
||||||
|
}
|
||||||
|
|
||||||
/* that's just a stub to be used by JS later, hid it! */
|
/* that's just a stub to be used by JS later, hid it! */
|
||||||
.shared-with-list > li.stub {
|
.shared-with-list > li.stub {
|
||||||
display:none;
|
display:none;
|
||||||
|
@ -162,4 +168,12 @@
|
||||||
content:" ";
|
content:" ";
|
||||||
margin:0.2em auto 0.5em auto;
|
margin:0.2em auto 0.5em auto;
|
||||||
border-top:solid 1px #ddd;
|
border-top:solid 1px #ddd;
|
||||||
|
}
|
||||||
|
|
||||||
|
hr.elegant-divider {
|
||||||
|
width: 75%;
|
||||||
|
height: 0px;
|
||||||
|
display: block;
|
||||||
|
margin: 0.2em auto 0.5em auto;
|
||||||
|
border-top: solid 1px #ddd;
|
||||||
}
|
}
|
|
@ -227,12 +227,5 @@
|
||||||
<?php if($_['eventid'] != 'new' && $_['permissions'] & OCP\PERMISSION_SHARE) { ?>
|
<?php if($_['eventid'] != 'new' && $_['permissions'] & OCP\PERMISSION_SHARE) { ?>
|
||||||
<div id="tabs-5">
|
<div id="tabs-5">
|
||||||
<?php if($_['eventid'] != 'new') { print_unescaped($this->inc('part.share')); } ?>
|
<?php if($_['eventid'] != 'new') { print_unescaped($this->inc('part.share')); } ?>
|
||||||
|
|
||||||
<br>
|
|
||||||
<?php p($l->t('Visibility to people shared with'));?>
|
|
||||||
<select style="width:140px;" name="accessclass">
|
|
||||||
<?php if (!isset($_['calendar'])) {$_['calendar'] = false;}
|
|
||||||
print_unescaped(OCP\html_select_options($_['access_class_options'], $_['accessclass'])); ?>
|
|
||||||
</select>
|
|
||||||
</div>
|
</div>
|
||||||
<?php } ?>
|
<?php } ?>
|
||||||
|
|
|
@ -47,16 +47,7 @@ $tmpl->assign('permissions', $_['permissions']);
|
||||||
$tmpl->assign('basic_edit_options', true);
|
$tmpl->assign('basic_edit_options', true);
|
||||||
$tmpl->assign('shared_with', $eventsharees);
|
$tmpl->assign('shared_with', $eventsharees);
|
||||||
$tmpl->printpage();
|
$tmpl->printpage();
|
||||||
/* link-sharing an event */
|
?><strong><?php p($l->t('Shared via calendar')); ?></strong>
|
||||||
$tmpl = new OCP\Template('calendar', 'part.linkshare');
|
|
||||||
$tmpl->assign('item_id', $_['eventid']);
|
|
||||||
$tmpl->assign('item_type', 'event');
|
|
||||||
$tmpl->assign('permissions', $_['permissions']);
|
|
||||||
$tmpl->assign('link_share', $linkShare);
|
|
||||||
$tmpl->printpage();
|
|
||||||
/* end link-sharing an event */
|
|
||||||
?><br />
|
|
||||||
<strong><?php p($l->t('Shared via calendar')); ?></strong>
|
|
||||||
<ul class="sharedby calendarlist">
|
<ul class="sharedby calendarlist">
|
||||||
<?php foreach($calsharees as $sharee): ?>
|
<?php foreach($calsharees as $sharee): ?>
|
||||||
<li data-share-with="<?php p($sharee['share_with']); ?>"
|
<li data-share-with="<?php p($sharee['share_with']); ?>"
|
||||||
|
@ -98,3 +89,25 @@ $tmpl->printpage();
|
||||||
$nobody = $l->t('Not shared with anyone via calendar');
|
$nobody = $l->t('Not shared with anyone via calendar');
|
||||||
print_unescaped('<div>' . OC_Util::sanitizeHTML($nobody) . '</div>');
|
print_unescaped('<div>' . OC_Util::sanitizeHTML($nobody) . '</div>');
|
||||||
} ?>
|
} ?>
|
||||||
|
|
||||||
|
<?php p($l->t('Visibility to people shared with'));?>
|
||||||
|
<select style="width:140px;" name="accessclass">
|
||||||
|
<?php if (!isset($_['calendar'])) {$_['calendar'] = false;}
|
||||||
|
print_unescaped(OCP\html_select_options($_['access_class_options'], $_['accessclass'])); ?>
|
||||||
|
</select>
|
||||||
|
|
||||||
|
<!-- disclaimer -->
|
||||||
|
<p class="disclaimer"><?php p($l->t('All items directly link-shared are available read-only but in full via the link, regardless of any visibility or privacy settings.')) ?></p>
|
||||||
|
<hr class="elegant-divider"/>
|
||||||
|
|
||||||
|
<?php
|
||||||
|
|
||||||
|
/* link-sharing an event */
|
||||||
|
$tmpl = new OCP\Template('calendar', 'part.linkshare');
|
||||||
|
$tmpl->assign('item_id', $_['eventid']);
|
||||||
|
$tmpl->assign('item_type', 'event');
|
||||||
|
$tmpl->assign('permissions', $_['permissions']);
|
||||||
|
$tmpl->assign('link_share', $linkShare);
|
||||||
|
$tmpl->printpage();
|
||||||
|
/* end link-sharing an event */
|
||||||
|
?>
|
||||||
|
|
Loading…
Reference in New Issue