diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_events.css | 6 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 73 | ||||
| -rwxr-xr-x | view/tpl/event_head.tpl | 25 | ||||
| -rwxr-xr-x | view/tpl/events-js.tpl | 22 |
4 files changed, 126 insertions, 0 deletions
diff --git a/view/css/mod_events.css b/view/css/mod_events.css index dc1dc902f..3e6ee63ac 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -4,6 +4,8 @@ margin-bottom: -1px; } +<<<<<<< HEAD +======= .fc-unthemed th, .fc-unthemed td, .fc-unthemed thead, @@ -19,10 +21,13 @@ margin-bottom: -9px; } +>>>>>>> upstream/master .bootstrap-tagsinput { width: 100%; padding: 6px 12px; } +<<<<<<< HEAD +======= .event-wrapper { max-width: 700px; @@ -50,3 +55,4 @@ #event-upload-choose { width: 100%; } +>>>>>>> upstream/master diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index e392f00d9..11e56cfc2 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -848,6 +848,71 @@ nav .acpopup { cursor: pointer; } +<<<<<<< HEAD +.fc-unthemed th, +.fc-unthemed td, +.fc-unthemed thead, +.fc-unthemed tbody, +.fc-unthemed .fc-divider, +.fc-unthemed .fc-row, +.fc-unthemed .fc-popover { + border-color: #ccc !important; +} + +.wall-event-item { + padding: 10px; + color: #fff; + background-color: #3A87AD; /* should reflect calendar color */ + border-top-left-radius: $radiuspx; + border-top-right-radius: $radiuspx; +} + +.vevent .event-end { + padding-bottom: 10px; +} + +#event-summary-text { + margin-top: 15px; +} + + +#new-event-link { + margin-bottom: 10px; +} + +.edit-event-link, .plink-event-link, .drop-event-link { + float: left; + margin-top: 4px; + margin-right: 4px; + margin-bottom: 15px; +} + +.event-owner img { + padding-bottom: 10px; + padding-right: 10px; +} + +.event-buttons { + margin-top: 10px; +} + +.event-list-date { + margin-bottom: 10px; +} + +.prevcal, .nextcal { + float: left; + margin-left: 32px; + margin-right: 32px; + margin-top: 64px; +} +.event-calendar-end { + clear: both; +} + + +======= +>>>>>>> upstream/master #cboxOverlay { z-index: 1050; } @@ -2195,3 +2260,11 @@ nav .badge.mail-update:hover { .help-searchlist a { font-size: 130%; } +<<<<<<< HEAD + +.response-list ul { + list-style-type: none; +} + +======= +>>>>>>> upstream/master diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index dc98d14b3..496a07782 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -58,8 +58,11 @@ $('#events-spinner').spin('tiny'); $('#events-spinner > i').css('color', 'transparent'); if(!isLoading) { +<<<<<<< HEAD +======= $('#events-spinner').spin(false); $('#events-spinner > i').css('color', ''); +>>>>>>> upstream/master $('td.fc-day').dblclick(function() { openMenu('form'); //window.location.href='/events/new?start='+$(this).data('date'); @@ -75,7 +78,11 @@ switch(view.name){ case "month": element.find(".fc-title").html( +<<<<<<< HEAD + "<img src='{0}' style='height:10px;width:10px'> {1}: {2}".format( +======= "<img src='{0}' style='height:12px;width:12px;' title='{1}'> <span title='{3}{4}'>{2}</span>".format( +>>>>>>> upstream/master event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, @@ -85,22 +92,40 @@ break; case "agendaWeek": element.find(".fc-title").html( +<<<<<<< HEAD + "<img src='{0}' style='height:10px; width:10px'> {1}: {2}<p>{3}</p><p>{4}</p>".format( + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], + event.title, + event.item.description, + event.item.location +======= "<img src='{0}' style='height:12px;width:12px;'> {1}: <span title='{3}{4}'>{2}</span>".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, event.item.description ? event.item.description + "\r\n\r\n" : '', event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' +>>>>>>> upstream/master )); break; case "agendaDay": element.find(".fc-title").html( +<<<<<<< HEAD + "<img src='{0}' style='height:10px;width:10px'> {1}: {2}<p>{3}</p><p>{4}</p>".format( + event.item['author']['xchan_photo_s'], + event.item['author']['xchan_name'], + event.title, + event.item.description, + event.item.location +======= "<img src='{0}' style='height:12px;width:12px;'> {1}: <span title='{3}{4}'>{2}</span>".format( event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, event.item.description ? event.item.description + "\r\n\r\n" : '', event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : '' +>>>>>>> upstream/master )); break; } diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl index 08c8aa64a..cef7b45cc 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,7 +1,13 @@ <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> +<<<<<<< HEAD + <button class="btn btn-default btn-xs" onclick="openClose('event-tools'); closeMenu('form');"><i class="icon-cog"></i></button> <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button> + +======= + <button class="btn btn-success btn-xs" onclick="openClose('form'); closeMenu('event-tools');">{{$new_event.1}}</button> +>>>>>>> upstream/master <div class="btn-group"> <button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button> <button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button> @@ -13,6 +19,22 @@ </div> <div id="form" class="section-content-tools-wrapper"{{if !$expandform}} style="display:none;"{{/if}}> {{$form}} +<<<<<<< HEAD + </div> + <div id="event-tools" class="section-content-tools-wrapper" style="display:none;"> + <div class="form-group"> + <button class="btn btn-primary btn-xs" onclick="exportDate(); return false;"><i class="icon-download"></i> {{$export.1}}</button> + <button class="btn btn-primary btn-xs" onclick="openClose('event-upload-form');"><i class="icon-upload"></i> {{$upload}}</button> + </div> + <div id="event-upload-form" style="display:none;"> + <form action="events" enctype="multipart/form-data" method="post" name="event-upload-form" id="event-upload-form"> + <button id="dbtn-submit" class="btn btn-primary btn-sm pull-right" type="submit" name="submit" >{{$submit}}</button> + <input id="event-upload-choose" type="file" name="userfile" /> + + </form> + </div> +======= +>>>>>>> upstream/master </div> <div class="clear"></div> <div class="section-content-wrapper-np"> |