From 4d97ea106cf45f9dd191358dc6bde3a7fab438c1 Mon Sep 17 00:00:00 2001 From: Haakon Meland Eriksen Date: Sun, 29 Nov 2015 11:55:39 +0100 Subject: Resolving merge conflict --- view/css/mod_events.css | 6 --- view/theme/redbasic/css/style.css | 73 -------------------------- view/tpl/event_head.tpl | 25 --------- view/tpl/events-js.tpl | 22 -------- view/tpl/jot.tpl | 107 +++++++++++++++++--------------------- 5 files changed, 49 insertions(+), 184 deletions(-) mode change 100644 => 100755 view/tpl/jot.tpl (limited to 'view') diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 3e6ee63ac..dc1dc902f 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -4,8 +4,6 @@ margin-bottom: -1px; } -<<<<<<< HEAD -======= .fc-unthemed th, .fc-unthemed td, .fc-unthemed thead, @@ -21,13 +19,10 @@ margin-bottom: -9px; } ->>>>>>> upstream/master .bootstrap-tagsinput { width: 100%; padding: 6px 12px; } -<<<<<<< HEAD -======= .event-wrapper { max-width: 700px; @@ -55,4 +50,3 @@ #event-upload-choose { width: 100%; } ->>>>>>> upstream/master diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 11e56cfc2..e392f00d9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -848,71 +848,6 @@ 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; } @@ -2260,11 +2195,3 @@ 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 496a07782..dc98d14b3 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -58,11 +58,8 @@ $('#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'); @@ -78,11 +75,7 @@ switch(view.name){ case "month": element.find(".fc-title").html( -<<<<<<< HEAD - " {1}: {2}".format( -======= " {2}".format( ->>>>>>> upstream/master event.item['author']['xchan_photo_s'], event.item['author']['xchan_name'], event.title, @@ -92,40 +85,22 @@ break; case "agendaWeek": element.find(".fc-title").html( -<<<<<<< HEAD - " {1}: {2}

{3}

{4}

".format( - event.item['author']['xchan_photo_s'], - event.item['author']['xchan_name'], - event.title, - event.item.description, - event.item.location -======= " {1}: {2}".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 - " {1}: {2}

{3}

{4}

".format( - event.item['author']['xchan_photo_s'], - event.item['author']['xchan_name'], - event.title, - event.item.description, - event.item.location -======= " {1}: {2}".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 cef7b45cc..08c8aa64a 100755 --- a/view/tpl/events-js.tpl +++ b/view/tpl/events-js.tpl @@ -1,13 +1,7 @@
-<<<<<<< HEAD - - -======= - ->>>>>>> upstream/master
@@ -19,22 +13,6 @@
-
diff --git a/view/tpl/jot.tpl b/view/tpl/jot.tpl old mode 100644 new mode 100755 index b13d66cc4..e7edb7e64 --- a/view/tpl/jot.tpl +++ b/view/tpl/jot.tpl @@ -48,24 +48,6 @@
- {{if $writefiles}} - - {{/if}} -
- - -
- {{if $feature_encrypt}} - - {{/if}} - {{if $feature_future}} - +
+