Browse Source

- Merge with edhelas

pull/16/head
Jaussoin Timothée 12 years ago
parent
commit
3c32c4b3bd
  1. 16
      app/models/sessionx/SessionxDAO.php
  2. 5
      app/widgets/Login/Login.php
  3. 2
      app/widgets/Login/login.tpl
  4. 5
      app/widgets/WidgetCommon/_comments_toolbox.tpl
  5. 7
      themes/movim/css/posts.css
  6. BIN
      themes/movim/img/favicon.ico

16
app/models/sessionx/SessionxDAO.php

@ -222,4 +222,20 @@ class SessionxDAO extends ModlSQL {
return $this->run('Sessionx');
}
function getConnected() {
$this->_sql = '
select count(*) from sessionx';
$this->prepare(
'Sessionx',
array(
)
);
$results = $this->run(null, 'array');
return (int)$results[0]['count(*)'];
}
}

5
app/widgets/Login/Login.php

@ -50,6 +50,11 @@ class Login extends WidgetBase {
$pop++;
$this->view->assign('pop', $pop-2);
$sd = new modl\SessionxDAO();
$connected = $sd->getConnected();
$this->view->assign('connected', $connected);
$this->view->assign('gmail',
t('%sGmail accounts are also compatible%s but are not fully supported',

2
app/widgets/Login/login.tpl

@ -82,7 +82,7 @@
{/if}
<div class="admin">
{$c->t('Population')} {$pop}
{$c->t('Connected')} {$connected}{$c->t('Population')} {$pop}
<a href="{$c->route('admin')}">
{$c->t('Administration')}
</a>

5
app/widgets/WidgetCommon/_comments_toolbox.tpl

@ -3,9 +3,8 @@
<div class="comment">
<a
class="getcomments icon chat"
onclick="{$getcomments} this.innerHTML = '{$c->t('Loading comments ...')}'">
{$c->t('Get the comments')}
</a>
onclick="{$getcomments} this.innerHTML = '{$c->t('Loading comments ...')}'"
>{$c->t('Get the comments')}</a>
</div>
</div>
<div class="comments">

7
themes/movim/css/posts.css

@ -201,11 +201,13 @@
.post .getcomments:before {
padding: 1em;
background-color: #FC8F12;
content: "";
}
.post .addcomment:before {
padding: 1em;
background-color: #6FCC43;
content: "";
}
.post .avatar {
@ -261,6 +263,11 @@
display: inline-block;
height: auto;
width: auto;
line-height: 1.5em;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.post a.imglink img {

BIN
themes/movim/img/favicon.ico

Loading…
Cancel
Save