From 85e82e919e146454a8b3973ed4a2a69066b98aa3 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Thu, 9 Jun 2016 22:05:52 +0200 Subject: more style work --- view/theme/redbasic/css/style.css | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index ae2826516..6510fb525 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1138,10 +1138,20 @@ margin-right: 50px; list-style-type: none; } +.generic-icons { + font-size: 1.2em; + color: $toolicon_colour; + margin-right: 7px; +} + +.generic-icons:hover { + color: $toolicon_colour; +} + .admin-icons { font-size: 1.2em; color: $toolicon_colour; - margin-right: 10px; + margin-right: 7px; } a .drop-icons { -- cgit v1.2.3 From b6d425838f9025d8faf6dbfe90fce091d94b3cd7 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Mon, 13 Jun 2016 17:19:49 +0200 Subject: css fixes --- view/theme/redbasic/css/style.css | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 9e2a0431b..5768ccbd9 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1152,12 +1152,15 @@ margin-right: 50px; margin-right: 7px; } +.drop-icons, a .drop-icons { color: $toolicon_colour; font-size: 1.2em; text-decoration: none; + cursor: pointer; } - + +.drop-icons:hover, a .drop-icons:hover { color: #FF0000; } -- cgit v1.2.3 From 24569a18dbb423f47429905cb38282813b0a6462 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 14 Jun 2016 23:21:26 +0200 Subject: css fix --- view/css/widgets.css | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/css/widgets.css b/view/css/widgets.css index 38809896c..2a7c57f53 100644 --- a/view/css/widgets.css +++ b/view/css/widgets.css @@ -11,6 +11,7 @@ width: 100%; border-top-right-radius: 0px; border-bottom-right-radius: 0px; + border-right: 0px; } .tags { -- cgit v1.2.3 From 7a4efcf67f57d6437af5596ad99920c1793cf450 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 19 Jun 2016 20:34:38 +0200 Subject: return something so we can make a conclusion --- view/js/main.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index f279417d9..2caf5a1dd 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -941,6 +941,11 @@ function dropItem(url, object) { $('body').css('cursor', 'auto'); }); }); + return true; + + } + else { + return false; } } -- cgit v1.2.3 From b155e93ab134759f3d31a509d197916a5af84adb Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 27 Jun 2016 19:04:00 -0700 Subject: add letsencrypt x3 intermediate cert and new cert file, improve UX of new registrations --- view/tpl/register.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view') diff --git a/view/tpl/register.tpl b/view/tpl/register.tpl index 4a827ca16..c84934626 100755 --- a/view/tpl/register.tpl +++ b/view/tpl/register.tpl @@ -54,5 +54,8 @@
+
+
{{$verify_note}}
+ -- cgit v1.2.3 From aff58934c0c33ad9bf68c0a3b3a0a224fee978ef Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 28 Jun 2016 11:56:28 +0200 Subject: update fullcalendar to version 2.8.0 --- view/css/mod_cal.css | 4 ---- view/css/mod_events.css | 4 ---- 2 files changed, 8 deletions(-) (limited to 'view') diff --git a/view/css/mod_cal.css b/view/css/mod_cal.css index 184227a91..f0b5c0166 100644 --- a/view/css/mod_cal.css +++ b/view/css/mod_cal.css @@ -1,7 +1,3 @@ -.fc-scroller { - overflow: hidden !important; -} - /* fix borders */ .fc th:first-child, diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 184227a91..f0b5c0166 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -1,7 +1,3 @@ -.fc-scroller { - overflow: hidden !important; -} - /* fix borders */ .fc th:first-child, -- cgit v1.2.3 From 7b2d54dffac5a5ee3c0ff79aee964ac0869b3142 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 28 Jun 2016 13:44:32 +0200 Subject: fix month view in fullscreen mode --- view/tpl/event_head.tpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl index 762bdcbb8..4397c5c9d 100755 --- a/view/tpl/event_head.tpl +++ b/view/tpl/event_head.tpl @@ -34,7 +34,13 @@ $('#events-calendar').fullCalendar('option', 'height', 'auto'); } else { - $('#events-calendar').fullCalendar('option', 'height', ''); + if($('main').hasClass('fullscreen')) { + $('#calendar').fullCalendar('option', 'height', $(window).height() - $('.section-title-wrapper').outerHeight(true) - 2); // -2 is for border width (.generic-content-wrapper top and bottom) of .generic-content-wrapper + + } + else { + $('#calendar').fullCalendar('option', 'height', ''); + } } $('#title').text(view.title); } -- cgit v1.2.3 From df4ff26845ea2868998c6a05397dc8e3aa07ba98 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 29 Jun 2016 17:53:59 -0700 Subject: only request geolocation permission if we're creating a post. --- view/tpl/jot-header.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/jot-header.tpl b/view/tpl/jot-header.tpl index f3dd8cafe..9953875ef 100755 --- a/view/tpl/jot-header.tpl +++ b/view/tpl/jot-header.tpl @@ -7,6 +7,7 @@ var pretext = '{{$pretext}}'; function initEditor(cb){ if (editor==false){ $("#profile-jot-text-loading").spin('small').show(); + {{$geotag}} if(plaintext == 'none') { $("#profile-jot-text-loading").spin(false).hide(); $("#profile-jot-text").css({ 'height': 200, 'color': '#000', 'line-height': 'inherit' }); @@ -362,7 +363,6 @@ function enableOnUser(){ $('#profile-nolocation-wrapper').attr('disabled', true); } - {{$geotag}} var initializeEmbedPhotoDialog = function () { $('.embed-photo-selected-photo').each(function (index) { -- cgit v1.2.3 From bfe84a9ff753d4d9834ea24ad65edfef3561458c Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 29 Jun 2016 22:46:47 -0700 Subject: templatise the Dreport page and add a redeliver option for when things stuff up badly. --- view/tpl/dreport.tpl | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 view/tpl/dreport.tpl (limited to 'view') diff --git a/view/tpl/dreport.tpl b/view/tpl/dreport.tpl new file mode 100644 index 000000000..7d5524a6a --- /dev/null +++ b/view/tpl/dreport.tpl @@ -0,0 +1,21 @@ +
+
+ {{if $table == 'item'}} + + {{/if}} +

{{$title}}

+
+ +
+ + {{if $entries}} + {{foreach $entries as $e}} + + + + + + {{/foreach}} + {{/if}} +
{{$e.name}}{{$e.result}}{{$e.time}}
+
-- cgit v1.2.3