diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 4 | ||||
| -rw-r--r-- | view/js/main.js | 14 | ||||
| -rw-r--r-- | view/theme/redbasic/js/redbasic.js | 3 | ||||
| -rw-r--r-- | view/tpl/cdav_calendar.tpl | 22 | ||||
| -rw-r--r-- | view/tpl/cdav_widget_calendar.tpl | 13 |
5 files changed, 32 insertions, 24 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 3ae1d152c..d2daf0b8a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -77,6 +77,10 @@ nav .dropdown-menu { } /* nav overrides end */ +.list-group-item:hover { + text-decoration: none; +} + .wall-item-tools .dropdown-menu { min-width: auto; } diff --git a/view/js/main.js b/view/js/main.js index 5592fd63d..48159e6e8 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1160,15 +1160,12 @@ function doreply(parent, ident, owner, hint) { } function doscroll(parent, hidden) { - var back = $('.back-to-reply'); - if(back.length == 0) { - var pos = Math.round($(window).scrollTop()); - } - else { - var pos = back.attr('href').replace(/\D/g,'') - } - back.remove(); var x = '#hide-comments-outer-' + hidden.toString(); + var back = $('.back-to-reply'); + if(back.length == 0) + var pos = $(window).scrollTop(); + else + var pos = back.attr('href').replace(/[^\d|\.]/g,''); if($(x).length !== 0) { x = $(x).attr("onclick").replace(/\D/g,''); var c = '#collapsed-comments-' + x; @@ -1177,6 +1174,7 @@ function doscroll(parent, hidden) { pos += $(c).height(); } } + back.remove(); var id = $('[data-mid="' + parent + '"]'); $('html, body').animate({scrollTop:(id.offset().top) - 50}, 'slow'); $('<a href="javascript:doscrollback(' + pos + ');" class="back-to-reply" title="' + aStr['to_reply'] + '"><i class="fa fa-angle-double-down float-right"> </i></a>').insertBefore('#wall-item-info-' + id.attr('id').replace(/\D/g,'')); diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index b8e7946c2..8d3b795cc 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -21,8 +21,7 @@ $(document).ready(function() { $('#left_aside_wrapper, #right_aside_wrapper').stick_in_parent({ offset_top: parseInt($('aside').css('padding-top')), parent: 'main', - spacer: '.aside_spacer', - recalc_every: 10 + spacer: '.aside_spacer' }); } diff --git a/view/tpl/cdav_calendar.tpl b/view/tpl/cdav_calendar.tpl index 88a322339..22579227a 100644 --- a/view/tpl/cdav_calendar.tpl +++ b/view/tpl/cdav_calendar.tpl @@ -63,6 +63,11 @@ $(document).ready(function() { event_uri = ''; $('#id_title').val('New event'); + $('#id_title').attr('disabled', false); + $('#id_dtstart').attr('disabled', false); + $('#id_dtend').attr('disabled', false); + $('#id_description').attr('disabled', false); + $('#id_location').attr('disabled', false); $('#calendar_select').val($("#calendar_select option:first").val()).attr('disabled', false); $('#id_dtstart').val(info.date.toUTCString()); $('#id_dtend').val(dtend ? dtend.toUTCString() : ''); @@ -102,6 +107,11 @@ $(document).ready(function() { $('.section-content-tools-wrapper, #event_form_wrapper').show(); $('#recurrence_warning').hide(); $('#id_title').focus().val(''); + $('#id_title').attr('disabled', false); + $('#id_dtstart').attr('disabled', false); + $('#id_dtend').attr('disabled', false); + $('#id_description').attr('disabled', false); + $('#id_location').attr('disabled', false); return false; } @@ -186,7 +196,6 @@ $(document).ready(function() { 'event_id': event_id, 'event_hash': event_uri, 'xchan': event_xchan, - //'mid': mid, 'type': 'event', 'preview': 0, 'summary': event.title, @@ -196,7 +205,6 @@ $(document).ready(function() { 'categories': event.extendedProps.categories, 'desc': event.extendedProps.description, 'location': event.extendedProps.location, - //'submit': $('#event_submit').val() }) .fail(function() { info.revert(); @@ -234,7 +242,6 @@ $(document).ready(function() { 'event_id': event_id, 'event_hash': event_uri, 'xchan': event_xchan, - //'mid': mid, 'type': 'event', 'preview': 0, 'summary': event.title, @@ -244,7 +251,6 @@ $(document).ready(function() { 'categories': event.extendedProps.categories, 'desc': event.extendedProps.description, 'location': event.extendedProps.location, - //'submit': $('#event_submit').val() }) .fail(function() { info.revert(); @@ -406,7 +412,6 @@ function on_submit() { 'event_id': event_id, 'event_hash': event_uri, 'xchan': event_xchan, - //'mid': mid, 'type': 'event', 'preview': 0, 'summary': $('#id_title').val(), @@ -416,7 +421,6 @@ function on_submit() { 'categories': $('#id_categories').val(), 'desc': $('#id_description').val(), 'location': $('#id_location').val(), - //'submit': $('#event_submit').val(), 'contact_allow[]': contact_allow, 'group_allow[]': group_allow, 'contact_deny[]': contact_deny, @@ -508,11 +512,7 @@ function on_more() { } function exportDate() { - alert('not implemented'); - console.log('not implemented'); - //var moment = $('#events-calendar').fullCalendar('getDate'); - //var sT = 'events/' + moment.year() + '/' + (moment.month() + 1) + '/export'; - //window.location.href=sT; + window.location.href= 'channel_calendar/export'; } </script> diff --git a/view/tpl/cdav_widget_calendar.tpl b/view/tpl/cdav_widget_calendar.tpl index a538cd26d..93ff50fd3 100644 --- a/view/tpl/cdav_widget_calendar.tpl +++ b/view/tpl/cdav_widget_calendar.tpl @@ -62,7 +62,9 @@ <label for="edit-form-{{$calendar.calendarid}}">{{$edit_label}}</label> <div id="edit-form-{{$calendar.calendarid}}" class="input-group form-group"> <input id="create-{{$calendar.calendarid}}" name="{DAV:}displayname" type="text" value="{{$calendar.displayname}}" class="form-control"> - <span class="input-group-addon"><i></i></span> + <div class="input-group-append"> + <div class="input-group-addon p-3"></div> + </div> </div> <div class="form-group"> <button type="submit" name="edit" value="edit" class="btn btn-primary btn-sm">{{$edit}}</button> @@ -99,10 +101,12 @@ <div id="create-calendar" class="sub-menu-wrapper"> <div class="sub-menu"> <form method="post" action="" class="colorpicker-component color-edit"> - <input id="color" name="color" type="hidden" value="#3a87ad" class="color-edit-input"> + <input id="color" name="color" type="hidden" value="#ff8f00" class="color-edit-input"> <div id="create-form" class="input-group form-group"> <input id="create" name="{DAV:}displayname" type="text" placeholder="{{$create_placeholder}}" class="form-control"> - <span class="input-group-addon"><i></i></span> + <div class="input-group-append"> + <div class="input-group-addon p-3"></div> + </div> </div> <div class="form-group"> <button type="submit" name="create" value="create" class="btn btn-primary btn-sm">{{$create}}</button> @@ -119,6 +123,9 @@ <div class="form-group"> <select id="import" name="target" class="form-control"> <option value="">{{$import_placeholder}}</option> + <optgroup label="{{$tools_options_label.0}}"> + <option value="{{$channel_calendar.calendarid}}">{{$channel_calendar.displayname}}</option> + <optgroup label="{{$tools_options_label.1}}"> {{foreach $writable_calendars as $writable_calendar}} <option value="{{$writable_calendar.id.0}}:{{$writable_calendar.id.1}}">{{$writable_calendar.displayname}}</option> {{/foreach}} |