Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

T1411: More compact event dialog

Browse source
This commit is contained in:
Aleksander Machniak 2017-07-18 14:13:14 -04:00
parent 40e0fa9155
commit 523686c97a
3 changed files with 37 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
plugins/calendar/calendar_ui.js
View file

@ -411,7 +411,7 @@ function rcube_calendar_ui(settings)
$('#event-repeat').show().children('.event-text').html(Q(event.recurrence_text));
if (event.valarms && event.alarms_text)
$('#event-alarm').show().children('.event-text').html(Q(event.alarms_text));
$('#event-alarm').show().children('.event-text').html(Q(event.alarms_text).replace(',', ',<br>'));
if (calendar.name)
$('#event-calendar').show().children('.event-text').html(Q(calendar.name)).attr('class', 'event-text cal-'+calendar.id).css('color', calendar.textColor || calendar.color || '');
@ -486,9 +486,9 @@ function rcube_calendar_ui(settings)
line = rcube_libcalendaring.attendee_html(data);
if (morelink)
overflow += line;
overflow += ' ' + line;
else
html += line;
html += ' ' + line;
// stop listing attendees
if (j == 7 && event.attendees.length >= 7) {

22
plugins/calendar/skins/larry/calendar.css
View file

@ -796,6 +796,9 @@ a.miniColors-trigger {
.calendarmain .eventdialog div.event-line {
margin-top: 0.1em;
margin-bottom: 0.3em;
white-space: nowrap;
overflow-x: hidden;
text-overflow: ellipsis;
}
.calendarmain .eventdialog div.event-line a.iconbutton {
@ -807,6 +810,15 @@ a.miniColors-trigger {
margin-left: 2em;
}
#event-description .event-text,
#event-attendees .event-text {
padding-top: 0.4em;
}
.eventdialog .spacer {
font-size: 4px;
}
.eventdialog .event-text-old,
.eventdialog .event-text-new,
.eventdialog .event-text-diff {
@ -961,16 +973,6 @@ div.form-section,
padding-right: 0.5em;
}
.calendarmain .eventdialog #event-url .event-text {
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
#event-links .attachmentslist {
display: inline-block;
}
#event-links label,
#edit-event-links label {
float: left;

45
plugins/calendar/skins/larry/templates/calendar.html
View file

@ -86,25 +86,24 @@
<div class="event-section" id="event-location">Location</div>
<div class="event-section" id="event-date">From-To</div>
<div class="event-section" id="event-description">
<h5 class="label"><roundcube:label name="calendar.description" /></h5>
<div class="event-text"></div>
</div>
<div class="event-section" id="event-url">
<h5 class="label"><roundcube:label name="calendar.url" /></h5>
<div class="event-text"></div>
</div>
<div class="event-section" id="event-repeat">
<h5 class="label"><roundcube:label name="calendar.repeat" /></h5>
<div class="event-text"></div>
</div>
<div class="event-section" id="event-alarm">
<h5 class="label"><roundcube:label name="calendar.alarms" /></h5>
<div class="event-text"></div>
</div>
<div class="event-section event-attendees" id="event-attendees">
<h5 class="label"><roundcube:label name="calendar.tabattendees" /></h5>
<div class="event-text"></div>
</div>
<div class="spacer">&nbsp;</div>
<div class="event-line" id="event-url">
<label><roundcube:label name="calendar.url" /></label>
<span class="event-text"></span>
</div>
<div class="event-line" id="event-repeat">
<label><roundcube:label name="calendar.repeat" /></label>
<span class="event-text"></span>
</div>
<div class="event-line" id="event-alarm">
<label><roundcube:label name="calendar.alarms" /></label>
<span class="event-text"></span>
</div>
<div class="event-line" id="event-partstat">
<label><roundcube:label name="calendar.mystatus" /></label>
<span class="changersvp" role="button" tabindex="0" title="<roundcube:label name='calendar.changepartstat' />">
@ -132,19 +131,12 @@
<label><roundcube:label name="calendar.priority" /></label>
<span class="event-text"></span>
</div>
<!--
<div class="event-line" id="event-sensitivity">
<label><roundcube:label name="calendar.sensitivity" /></label>
<span class="event-text"></span>
</div>
<div class="event-section" id="event-links">
<label><roundcube:label name="calendar.links" /></label>
<span class="event-text"></span>
<br style="clear:left">
</div>
<div class="event-section" id="event-attachments">
<label><roundcube:label name="attachments" /></label>
<div class="event-text"></div>
</div>
-->
<div class="event-line" id="event-created-changed">
<label><roundcube:label name="calendar.created" /></label>
<span class="event-text event-created"></span>
@ -155,6 +147,13 @@
<label><roundcube:label name="calendar.rsvpcomment" /></label>
<span class="event-text"></span>
</div>
<div class="event-section" id="event-links">
<label><roundcube:label name="calendar.links" /></label>
<span class="event-text"></span>
</div>
<div class="event-section" id="event-attachments">
<div class="event-text"></div>
</div>
<roundcube:object name="plugin.event_rsvp_buttons" id="event-rsvp" class="event-dialog-message" style="display:none" />
</div>