From dce0bb0ef806d88a855c362f359b7b1a350deff2 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 26 Feb 2015 16:41:38 -0800 Subject: finish converting "delete" to trash icons for consistency. The 'x' was left in a couple of places like the group list widget and saved search term widget and ignoring friend suggestions where it was more appropriate to leave it. --- doc/to_do_code.bb | 2 +- install/update.php | 8 ++++++-- view/js/main.js | 2 +- view/tpl/admin_channels.tpl | 2 +- view/tpl/admin_users.tpl | 2 +- view/tpl/app.tpl | 2 +- view/tpl/item_filer.tpl | 2 +- view/tpl/locmanage.tpl | 2 +- view/tpl/mail_conv.tpl | 2 +- view/tpl/mail_list.tpl | 2 +- view/tpl/menulist.tpl | 2 +- view/tpl/mitemlist.tpl | 2 +- view/tpl/photo_drop.tpl | 2 +- view/tpl/settings_oauth.tpl | 2 +- view/tpl/show_thing.tpl | 2 +- 15 files changed, 20 insertions(+), 16 deletions(-) diff --git a/doc/to_do_code.bb b/doc/to_do_code.bb index 5a5ae76fd..1fa2b17d4 100644 --- a/doc/to_do_code.bb +++ b/doc/to_do_code.bb @@ -5,6 +5,7 @@ We need much more than this, but here are areas where developers can help. Pleas [li]Documentation - see Red Documentation Project To-Do List[/li] [li]Include TOS link in registration/verification email[/li] [li]Create bug tracker module[/li] +[li]Infinite scroll improvements (i.e. embedded page links) see http://scrollsample.appspot.com/items [li]Finish the anti-spam bayesian engine[/li] [li]implement an email permission denied bounce message from the sys channel[/li] [li]finish Wordpress connector - import wordpress comments back to redmatrix[/li] @@ -23,7 +24,6 @@ We need much more than this, but here are areas where developers can help. Pleas [li]service classes - provide a pluggable subscription payment gateway for premium accounts[/li] [li]service classes - account overview page showing resources consumed by channel. With special consideration this page can also be accessed at a meta level by the site admin to drill down on problematic accounts/channels.[/li] [li]Events module - fix permissions on events, and provide JS translation support for the calendar overview; integrate with calDAV[/li] -[li]Events module - event followups[/li] [li]Uploads - integrate #^[url=https://github.com/blueimp/jQuery-File-Upload]https://github.com/blueimp/jQuery-File-Upload[/url][/li] [li]Import/export - include events, things, etc.[/li] [li]Import channel from Diaspora/Friendica[/li] diff --git a/install/update.php b/install/update.php index ee13bee78..70ffb1ebf 100644 --- a/install/update.php +++ b/install/update.php @@ -26,10 +26,14 @@ define( 'UPDATE_VERSION' , 1138 ); * The DB_UPDATE_VERSION will always be one greater than the last numbered script in this file. * * If you change the database schema, the following are required: - * 1. Update the file database.sql to match the new schema. + * 1. Update the files schema_mysql.sql and schema_postgres.sql to match the new schema. + * Be sure to read doc/sql_conventions.bb ($yoururl/help/sql_conventions) use only standard + * SQL data types where possible to keep differences in the files to a minimum * 2. Update this file by adding a new function at the end with the number of the current DB_UPDATE_VERSION. * This function should modify the current database schema and perform any other steps necessary - * to ensure that upgrade is silent and free from requiring interaction. + * to ensure that upgrade is silent and free from requiring interaction. Review to ensure that it + * will run correctly on both postgres and MySQL/Mariadb. It is very difficult and messy to fix DB update + * errors. Once pushed, it requires a new update which undoes any damage and performs the corrected updated. * 3. Increment the DB_UPDATE_VERSION in boot.php *AND* the UPDATE_VERSION in this file to match it * 4. TEST the upgrade prior to checkin and filing a pull request. * diff --git a/view/js/main.js b/view/js/main.js index a10e91449..ee94d05e5 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -1166,7 +1166,7 @@ $(window).scroll(function () { } if($(window).scrollTop() + $(window).height() > $(document).height() - 100) { -// if($(window).scrollTop() > ($(document).height() - $(window).height() * 1.5 )) { +// if($(window).scrollTop() > $(document).height() - ($(window).height() * 1.5 )) { if((pageHasMoreContent) && (! loadingPage)) { $('#more').hide(); diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 817eb939a..f4612c094 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -35,7 +35,7 @@ - + {{/foreach}} diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 5bf64b4df..7e0b828d9 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -76,7 +76,7 @@ - + {{/foreach}} diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 9f0b1746b..cebc17d45 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -11,7 +11,7 @@ {{if $install}}{{/if}} {{if $edit}}{{/if}} -{{if $delete}}{{/if}} +{{if $delete}}{{/if}} {{/if}} {{/if}} diff --git a/view/tpl/item_filer.tpl b/view/tpl/item_filer.tpl index 0e68a172a..07163d59a 100644 --- a/view/tpl/item_filer.tpl +++ b/view/tpl/item_filer.tpl @@ -1,7 +1,7 @@ {{if $categories}}
{{foreach $categories as $cat}} - {{$cat.term}}  + {{$cat.term}}  {{/foreach}}
{{/if}} diff --git a/view/tpl/locmanage.tpl b/view/tpl/locmanage.tpl index d1bb00543..40f91a8bb 100644 --- a/view/tpl/locmanage.tpl +++ b/view/tpl/locmanage.tpl @@ -19,7 +19,7 @@ function drophub(id) { {{if $hub.primary}}{{else}}{{/if}} -{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}{{/if}}{{/if}} +{{if $hub.primary}}{{else}}{{if ! $hub.deleted}}{{/if}}{{/if}} {{/foreach}} diff --git a/view/tpl/mail_conv.tpl b/view/tpl/mail_conv.tpl index f794ffc78..a75939617 100755 --- a/view/tpl/mail_conv.tpl +++ b/view/tpl/mail_conv.tpl @@ -8,7 +8,7 @@
{{$mail.date}}
{{$mail.subject}}
{{$mail.body}}
-
+
{{if $mail.can_recall}}
{{/if}} diff --git a/view/tpl/mail_list.tpl b/view/tpl/mail_list.tpl index 6b06f6127..8643f27b9 100755 --- a/view/tpl/mail_list.tpl +++ b/view/tpl/mail_list.tpl @@ -3,6 +3,6 @@ {{$from_name}} {{$subject}} {{$date}} - +
 
diff --git a/view/tpl/menulist.tpl b/view/tpl/menulist.tpl index bb862fef0..35ad91937 100644 --- a/view/tpl/menulist.tpl +++ b/view/tpl/menulist.tpl @@ -9,7 +9,7 @@ {{if $menus }} {{/if}} diff --git a/view/tpl/mitemlist.tpl b/view/tpl/mitemlist.tpl index 2c1ded6cc..dc5b0e9f9 100644 --- a/view/tpl/mitemlist.tpl +++ b/view/tpl/mitemlist.tpl @@ -10,7 +10,7 @@ {{if $mlist }} {{/if}} diff --git a/view/tpl/photo_drop.tpl b/view/tpl/photo_drop.tpl index cb7ae17ba..31b654374 100755 --- a/view/tpl/photo_drop.tpl +++ b/view/tpl/photo_drop.tpl @@ -1,4 +1,4 @@
- +
diff --git a/view/tpl/settings_oauth.tpl b/view/tpl/settings_oauth.tpl index f7b4a0b1a..20e8f458f 100755 --- a/view/tpl/settings_oauth.tpl +++ b/view/tpl/settings_oauth.tpl @@ -24,7 +24,7 @@ {{/if}} {{if $app.my}} - + {{/if}} {{/foreach}} diff --git a/view/tpl/show_thing.tpl b/view/tpl/show_thing.tpl index c48912918..9aacc8958 100644 --- a/view/tpl/show_thing.tpl +++ b/view/tpl/show_thing.tpl @@ -7,7 +7,7 @@ {{if $canedit}}
- +
{{/if}} -- cgit v1.2.3