From 75d0f6329cc532c7f74927bdaa678d8d85f45a9e Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 3 Sep 2014 01:09:28 -0700 Subject: outbound feed issue --- view/tpl/atom_feed.tpl | 1 + 1 file changed, 1 insertion(+) (limited to 'view') diff --git a/view/tpl/atom_feed.tpl b/view/tpl/atom_feed.tpl index 2c8024d47..9e5b5a5be 100755 --- a/view/tpl/atom_feed.tpl +++ b/view/tpl/atom_feed.tpl @@ -15,6 +15,7 @@ {{$feed_title}} {{$red}} + {{if $hub}} {{$hub}} {{/if}} -- cgit v1.2.3 From 50c137d152f0e0df3a7912ba361c68dc5de13565 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 17:51:24 -0700 Subject: constrain photos to a fixed block regardless of aspect ratio --- view/theme/redbasic/css/style.css | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 0f2949a49..5ff32ff58 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -660,11 +660,33 @@ aside li { } .photo-top-photo, .photo-album-photo { - padding: 10px; + /* padding: 10px; max-width: 300px; border: 1px solid #888888; +*/ + position: absolute; + display: block; + max-width: 100%; + max-height: 100%; + left: 0; + right: 0; + top: 0; + bottom: 0; + margin: auto; } +.photo-top-image-wrapper, .photo-album-image-wrapper { + width: 300px; +} + +.photo-top-photo-link, .photo-album-photo-link { + display: block; + width: 100%; + position: relative; + height: 0; + padding: 75% 0 0 0; + overflow: hidden; +} .photo-album-image-wrapper .caption { background-color: $acpopup_bgcolour; -- cgit v1.2.3 From d71e304b150f500af60c215e9772f94b9a9f300b Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 21:18:47 -0700 Subject: this improves the photos even more --- view/theme/redbasic/css/style.css | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 5ff32ff58..bcbaec3d0 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -666,8 +666,8 @@ aside li { */ position: absolute; display: block; - max-width: 100%; - max-height: 100%; +/* max-width: 100%; + max-height: 100%; */ left: 0; right: 0; top: 0; @@ -676,7 +676,7 @@ aside li { } .photo-top-image-wrapper, .photo-album-image-wrapper { - width: 300px; + width: 240px; } .photo-top-photo-link, .photo-album-photo-link { -- cgit v1.2.3 From 92e4448993ed22e155f2ada3658f1e2378e271cc Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 4 Sep 2014 22:30:12 -0700 Subject: put a date and time picker on events --- view/tpl/event_form.tpl | 88 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 87 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index bfdf4d0b6..611bf6006 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -1,7 +1,8 @@

{{$title}}

-{{$desc}} +{{if ! $bootstrap}} +{{$format_desc}} {{/if}}{{$desc}}

@@ -11,7 +12,11 @@
{{$s_text}}
+{{if $bootstrap}} + +{{else}} {{$s_dsel}} {{$s_tsel}} +{{/if}}

@@ -21,7 +26,11 @@
{{$f_text}}
+{{if $bootstrap}} + +{{else}} {{$f_dsel}} {{$f_tsel}} +{{/if}}
@@ -51,4 +60,81 @@
+ + + + + + + -- cgit v1.2.3 From dd7d0c4156a28cfc820700d3ba7b45bcbf58bf2e Mon Sep 17 00:00:00 2001 From: friendica Date: Fri, 5 Sep 2014 01:58:27 -0700 Subject: more work on the event edit form --- view/tpl/event_form.tpl | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'view') diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 611bf6006..95ebe0351 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -11,6 +11,9 @@ +
{{$t_text}}
+ +
{{$s_text}}
{{if $bootstrap}} @@ -20,17 +23,18 @@

-
{{$n_text}}
+
{{$n_text}}
- +
{{$f_text}}
{{if $bootstrap}} {{else}} {{$f_dsel}} {{$f_tsel}} {{/if}} +
@@ -39,8 +43,16 @@
-
{{$t_text}}
- + + +{{if $catsenabled}} +
+ +
+{{/if}} + + +
{{$d_text}}
-- cgit v1.2.3 From 28b75b028dcb1633a9407a5a5c79e5d2423e18a5 Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 6 Sep 2014 00:37:15 -0700 Subject: ajax work --- view/js/main.js | 2 +- view/js/mod_events.js | 37 +++++++++++++++++++++++++++++++++++++ view/tpl/photos_recent.tpl | 3 +++ view/tpl/photosajax.tpl | 4 ++++ 4 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 view/js/mod_events.js create mode 100755 view/tpl/photosajax.tpl (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index b5b77d473..c31e6231a 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -689,7 +689,7 @@ function updateConvItems(mode,data) { bParam_page = 1; } - update_url = baseurl + '/directory/?f=&aj=1&page=' + bParam_page; + update_url = baseurl + '/' + page_query + '/?f=&aj=1&page=' + bParam_page + extra_args ; $("#page-spinner").spin('small'); update_mode = 'append'; diff --git a/view/js/mod_events.js b/view/js/mod_events.js new file mode 100644 index 000000000..0ce128fcc --- /dev/null +++ b/view/js/mod_events.js @@ -0,0 +1,37 @@ + +$(document).ready( function() { showHideFinishDate(); }); + +function showHideFinishDate() { + if( $('#event-nofinish-checkbox').is(':checked')) + $('#event-finish-wrapper').hide(); + else + $('#event-finish-wrapper').show(); +} + + + + function eventGetStart() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#startModal').modal(); + $('#start-modal-OKButton').on('click', function() { + reply=$('#start-date').val(); + if(reply && reply.length) { + $('#start-text').val(reply); + $('#startModal').modal('hide'); + } + }) + + + } + function eventGetFinish() { + //reply = prompt("{{$expirewhen}}", $('#jot-expire').val()); + $('#finishModal').modal(); + $('#finish-modal-OKButton').on('click', function() { + reply=$('#finish-date').val(); + if(reply && reply.length) { + $('#finish-text').val(reply); + $('#finishModal').modal('hide'); + } + }) + + } diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 43a22a017..9be1b12a7 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -7,5 +7,8 @@ {{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} +
+ +
diff --git a/view/tpl/photosajax.tpl b/view/tpl/photosajax.tpl new file mode 100755 index 000000000..a88682e8b --- /dev/null +++ b/view/tpl/photosajax.tpl @@ -0,0 +1,4 @@ + +{{foreach $photos as $photo}} + {{include file="photo_top.tpl"}} +{{/foreach}} -- cgit v1.2.3 From b6d1ff3d8f20b146a86adbee5571ffbfa4ff610e Mon Sep 17 00:00:00 2001 From: friendica Date: Sat, 6 Sep 2014 05:22:30 -0700 Subject: hook photos scroll to page down --- view/js/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/js/main.js b/view/js/main.js index c31e6231a..8c4fcdc13 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -285,7 +285,7 @@ scroll_next = true; loadingPage = true; - if($('.directory-end').length == 0) + if(($('.directory-end').length == 0) && ($('.photos-end').length == 0)) liveUpdate(); else pageUpdate(); -- cgit v1.2.3 From 11b5ec7ec8bc6492f63ffe2be92ecb5e97fed800 Mon Sep 17 00:00:00 2001 From: Jeroen Date: Sun, 7 Sep 2014 21:46:20 +0000 Subject: Added abook-changed background colour to dark schema --- view/theme/redbasic/css/style.css | 4 ++++ view/theme/redbasic/php/style.php | 3 +++ view/theme/redbasic/schema/dark.php | 12 +++++++----- 3 files changed, 14 insertions(+), 5 deletions(-) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index bcbaec3d0..4062c259c 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2184,6 +2184,10 @@ img.mail-list-sender-photo { background-color: $abookself_bgcolour; } +.abook-pending-contact, .abook-permschange { + background: $abook_changebg; +} + .online-now { color: red; cursor: pointer; diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 4ffdcbef8..dbe7c306d 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -276,6 +276,8 @@ if(! $a->install) { $dirpopup_txtcol=""; if (!$dirpopup_linkcol) $dirpopup_linkcol=""; + if (!$abook_changebg) + $abook_changebg="orange"; if($nav_min_opacity === false || $nav_min_opacity === '') { $nav_float_min_opacity = 1.0; @@ -400,6 +402,7 @@ $options = array ( '$admintable_hoverbgcol' => $admintable_hoverbgcol, '$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_linkcol' => $dirpopup_linkcol, +'$abook_changebg' => $abook_changebg, ); echo str_replace(array_keys($options), array_values($options), $x); diff --git a/view/theme/redbasic/schema/dark.php b/view/theme/redbasic/schema/dark.php index 69fcf403f..a4b43b31e 100644 --- a/view/theme/redbasic/schema/dark.php +++ b/view/theme/redbasic/schema/dark.php @@ -154,15 +154,15 @@ $abookself_bgcolour = "#251111"; if(! $infomess_bgcolour) $infomess_bgcolour = "#333"; - if(! $advperm_bgcolour) + if(! $advperm_bgcolour) $advperm_bgcolour = "#1E1E1E"; - if(! $advperm_bordercol) + if(! $advperm_bordercol) $advperm_bordercol = "#222"; - if(! $advperm_gradientcol) + if(! $advperm_gradientcol) $advperm_gradientcol = "#111"; - if(! $cal_bgcolour) + if(! $cal_bgcolour) $cal_bgcolour = "#333"; - if(! $fancybox_bgcolour) + if(! $fancybox_bgcolour) $fancybox_bgcolour = "#1E1E1E"; if (!$admintable_hoverbgcol) $admintable_hoverbgcol="#222"; @@ -170,3 +170,5 @@ $dirpopup_txtcol="#111"; if (!$dirpopup_linkcol) $dirpopup_linkcol="#000"; + if (!$abook_changebg) + $abook_changebg="#402900"; -- cgit v1.2.3 From 4faeebddb22095509149ecd37b548e8ac9151d59 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 7 Sep 2014 17:13:44 -0700 Subject: Diaspora actually puts the account full name into the "nickname" field of the vcard. They don't put the nickname into the vcard at all. One wonders why even have a nickname field since the fullname is already presented in the next line. This hasn't caused us a problem with Friendica because I'm guessing nobody actually uses this line, though the number of class tags on it makes it seem somewhat important. --- view/tpl/diaspora_vcard.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/diaspora_vcard.tpl b/view/tpl/diaspora_vcard.tpl index 9d234a398..f9dac9306 100644 --- a/view/tpl/diaspora_vcard.tpl +++ b/view/tpl/diaspora_vcard.tpl @@ -2,7 +2,7 @@
Nickname
- {{$diaspora.nickname}} + {{$diaspora.fullname}}
-- cgit v1.2.3 From ed847a91f6f8221bc13523574baf4ab7b3cf430a Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 7 Sep 2014 22:14:28 -0700 Subject: add categories to events --- view/css/mod_events.css | 14 ++++++++++++++ view/tpl/event_form.tpl | 4 +--- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/css/mod_events.css b/view/css/mod_events.css index 657eff082..0aef13aa6 100644 --- a/view/css/mod_events.css +++ b/view/css/mod_events.css @@ -1,3 +1,17 @@ #event-desc-textarea, #event-location-textarea { width: 400px; +} + +#event-summary { + width: 400px; +} + +.event-cats { + margin-top: 15px; + width: 400px; +} + +.required { + color: #ff0000; + font-size: 1.2rem; } \ No newline at end of file diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index 95ebe0351..af10e6c73 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -47,14 +47,12 @@ {{if $catsenabled}}
- +
{{/if}} - -
{{$d_text}}
-- cgit v1.2.3 From b1254a71bc98cff230bbbba597da98cb96947cc6 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 8 Sep 2014 16:28:02 -0700 Subject: wrap photo albums (albums and top level) in a div id=photo-album-contents --- view/tpl/photos_recent.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/photos_recent.tpl b/view/tpl/photos_recent.tpl index 9be1b12a7..386979de5 100755 --- a/view/tpl/photos_recent.tpl +++ b/view/tpl/photos_recent.tpl @@ -3,7 +3,7 @@ {{$upload.0}} {{/if}} -
+
{{foreach $photos as $photo}} {{include file="photo_top.tpl"}} {{/foreach}} -- cgit v1.2.3