From 2d3b95e7fc8d4c3ae527fcf657203e0f9cce6951 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jaussoin=20Timoth=C3=A9e?= Date: Thu, 2 Oct 2014 10:25:05 +0200 Subject: [PATCH] - Update the changelog - Update to 0.8.1 - Fix minor mobile UI issues - Add the status in the Roster - Hide some stuffs on mobile --- CHANGELOG.md | 6 +++++- app/models/postn/PostnDAO.php | 21 +++++++++++++++++++++ app/views/about.tpl | 1 + app/widgets/Discover/discover.tpl | 8 ++++---- app/widgets/Explore/explore.tpl | 2 +- app/widgets/Login/login.css | 7 ++++++- app/widgets/Roster/_roster_contact.tpl | 4 ++-- app/widgets/WidgetCommon/_post.tpl | 2 +- manifest.webapp | 2 +- 9 files changed, 42 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0c4141f3b..2a7b3fe6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,12 +3,16 @@ Movim Changelog v0.8.1 (trunk) --------------------------- + * Add charts in the Statistics * Add a Caps support table * Fix some Jingle issues * New Mud actions to create/update the database and change the administration configuration * New InitAccount widget to create persistent PEP node on the first login * Clean the Feed widget - * Fix various CSS bugs + * Fix various CSS bugs + fix mobile UI + * Add title attribute to some truncated texts + * Add a new fancy login system + * Show the status in the Roster v0.8.0 --------------------------- diff --git a/app/models/postn/PostnDAO.php b/app/models/postn/PostnDAO.php index 832c921cb..03d159840 100644 --- a/app/models/postn/PostnDAO.php +++ b/app/models/postn/PostnDAO.php @@ -220,6 +220,27 @@ class PostnDAO extends SQL { return $this->run('ContactPostn'); } + + function getAllPosts($jid, $limitf = false, $limitr = false) { + $this->_sql = ' + select *, postn.aid, privacy.value as privacy from postn + left outer join contact on postn.aid = contact.jid + left outer join privacy on postn.nodeid = privacy.pkey + where postn.session = :session + order by postn.published desc'; + + if($limitr) + $this->_sql = $this->_sql.' limit '.$limitr.' offset '.$limitf; + + $this->prepare( + 'Postn', + array( + 'session' => $jid + ) + ); + + return $this->run('ContactPostn'); + } function getFeed($limitf = false, $limitr = false) { $this->_sql = ' diff --git a/app/views/about.tpl b/app/views/about.tpl index 637f71c64..1dd3cc366 100644 --- a/app/views/about.tpl +++ b/app/views/about.tpl @@ -10,5 +10,6 @@
widget('About');?> widget('Caps');?> + widget('Search');?>
diff --git a/app/widgets/Discover/discover.tpl b/app/widgets/Discover/discover.tpl index 398713eab..518975861 100644 --- a/app/widgets/Discover/discover.tpl +++ b/app/widgets/Discover/discover.tpl @@ -7,16 +7,16 @@ {if="$value->getAge()"} - {$value->getAge()} + {$value->getAge()} {/if} {if="$value->getGender()"} - {$value->getGender()} + {$value->getGender()} {/if} {if="$value->getMarital()"} - {$value->getMarital()} + {$value->getMarital()} {/if} {$value->getTrueName()} - {$value->description|strip_tags} + {$value->description|strip_tags} {/loop} diff --git a/app/widgets/Explore/explore.tpl b/app/widgets/Explore/explore.tpl index b91af37ed..f2a970a0f 100644 --- a/app/widgets/Explore/explore.tpl +++ b/app/widgets/Explore/explore.tpl @@ -26,7 +26,7 @@ {$value->getMarital()} {/if} {$value->getTrueName()} - {$value->description|strip_tags} + {$value->description|strip_tags} {/loop} diff --git a/app/widgets/Login/login.css b/app/widgets/Login/login.css index 2aaf02a88..915872efa 100644 --- a/app/widgets/Login/login.css +++ b/app/widgets/Login/login.css @@ -151,7 +151,12 @@ body { #loginpage #sessions ul li span { color: white; line-height: 2.8em; - padding: 1em; + white-space: nowrap; + text-overflow: ellipsis; + text-indent: 0.5em; + width: 65%; + display: inline-block; + overflow: hidden; } /* States */ diff --git a/app/widgets/Roster/_roster_contact.tpl b/app/widgets/Roster/_roster_contact.tpl index 66b4a8098..ff0985dc1 100644 --- a/app/widgets/Roster/_roster_contact.tpl +++ b/app/widgets/Roster/_roster_contact.tpl @@ -5,7 +5,7 @@