Browse Source

First small fixes for the yesterday commit

pull/101/head
Jaussoin Timothée 10 years ago
parent
commit
90f88984e3
  1. 2
      app/assets/js/movim_websocket.js
  2. 2
      app/widgets/Group/group.tpl
  3. 4
      app/widgets/Login/_login_sessions.tpl
  4. 2
      app/widgets/Menu/Menu.php
  5. 22
      app/widgets/Menu/_menu_list.tpl
  6. 2
      app/widgets/Menu/menu.css
  7. 24
      app/widgets/Menu/menu.tpl
  8. 4
      app/widgets/Roster/roster.css
  9. 2
      themes/material/css/listn.css

2
app/assets/js/movim_websocket.js

@ -174,7 +174,7 @@ var MovimWebsocket = {
} }
// generate the interval to a random number between 0 and the maxInterval determined from above // generate the interval to a random number between 0 and the maxInterval determined from above
return Math.random() * maxInterval;
return Math.random() * maxInterval;
} }
} }

2
app/widgets/Group/group.tpl

@ -1,4 +1,4 @@
<div id="group_widget" class="card shadow spinner">
<div id="group_widget" class="card shadow spinner" style="background-color: #EEE;">
{$c->prepareEmpty()} {$c->prepareEmpty()}
{if="$server && $node"} {if="$server && $node"}
<script type="text/javascript"> <script type="text/javascript">

4
app/widgets/Login/_login_sessions.tpl

@ -17,8 +17,8 @@
<span class="control icon gray"> <span class="control icon gray">
<i class="zmdi zmdi-close"></i> <i class="zmdi zmdi-close"></i>
</span> </span>
<p>{$value->getTrueName()}</p>
<p>{$value->jid}</p>
<p class="line">{$value->getTrueName()}</p>
<p class="line">{$value->jid}</p>
</li> </li>
{/loop} {/loop}
</ul> </ul>

2
app/widgets/Menu/Menu.php

@ -108,7 +108,7 @@ class Menu extends WidgetBase
RPC::call('movim_posts_unread', 0); RPC::call('movim_posts_unread', 0);
} }
RPC::call('Menu.refresh'); RPC::call('Menu.refresh');
RPC::call('MovimTpl.scrollTop');
//RPC::call('MovimTpl.scrollTop');
} }
function ajaxRefresh() function ajaxRefresh()

22
app/widgets/Menu/_menu_list.tpl

@ -1,3 +1,25 @@
{if="$page == 0"}
<header>
<ul class="list middle">
<li>
<span id="menu" class="primary on_mobile icon active" onclick="MovimTpl.toggleMenu()"><i class="zmdi zmdi-menu"></i></span>
<span class="primary on_desktop icon gray"><i class="zmdi zmdi-filter-list"></i></span>
<p class="center line">{$c->__('page.news')}</p>
</li>
</ul>
<ul>
<li>
<ul class="tabs">
<li {if="$type == 'all'"}class="active"{/if}><a href="#" onclick="Menu_ajaxGetAll()">{$c->__('menu.all')}</a></li>
<li {if="$type == 'news'"}class="active"{/if} ><a href="#" onclick="Menu_ajaxGetNews()"><i class="zmdi zmdi-pages"></i></a></li>
<li {if="$type == 'feed'"}class="active"{/if}><a href="#" onclick="Menu_ajaxGetFeed()"><i class="zmdi zmdi-accounts"></i></a></li>
<li {if="$type == 'me'"}class="active"{/if}><a href="#" onclick="Menu_ajaxGetMe()"><i class="zmdi zmdi-portable-wifi"></i></a></li>
</ul>
</li>
</ul>
</header>
{/if}
{if="$items"} {if="$items"}
{if="$page == 0"} {if="$page == 0"}
<div id="menu_refresh"></div> <div id="menu_refresh"></div>

2
app/widgets/Menu/menu.css

@ -1,4 +1,4 @@
#menu_widget_wrapper {
#menu_widget {
background-color: #EEE; background-color: #EEE;
} }

24
app/widgets/Menu/menu.tpl

@ -1,23 +1,3 @@
<div id="menu_widget_wrapper">
<header>
<ul class="list">
<li>
<span id="menu" class="primary on_mobile icon active" onclick="MovimTpl.toggleMenu()"><i class="zmdi zmdi-menu"></i></span>
<span class="primary on_desktop icon gray"><i class="zmdi zmdi-filter-list"></i></span>
<p>{$c->__('page.news')}</p>
</li>
<li>
<ul class="tabs">
<li {if="$type == 'all'"}class="active"{/if}><a href="#" onclick="Menu_ajaxGetAll()">{$c->__('menu.all')}</a></li>
<li {if="$type == 'news'"}class="active"{/if} ><a href="#" onclick="Menu_ajaxGetNews()"><i class="zmdi zmdi-pages"></i></a></li>
<li {if="$type == 'feed'"}class="active"{/if}><a href="#" onclick="Menu_ajaxGetFeed()"><i class="zmdi zmdi-accounts"></i></a></li>
<li {if="$type == 'me'"}class="active"{/if}><a href="#" onclick="Menu_ajaxGetMe()"><i class="zmdi zmdi-portable-wifi"></i></a></li>
</ul>
</li>
</ul>
</header>
<div id="menu_widget">
{$c->prepareList('all')}
</div>
<div id="menu_widget">
{$c->prepareList('all')}
</div> </div>

4
app/widgets/Roster/roster.css

@ -1,3 +1,7 @@
#roster {
background-color: #EEE;
}
#roster form div { #roster form div {
min-height: 0; min-height: 0;
top: 0; top: 0;

2
themes/material/css/listn.css

@ -266,7 +266,7 @@ ul.tabs > li {
} }
ul.tabs > li > a { ul.tabs > li > a {
padding: 0 3rem;
padding: 1.5rem 3rem;
} }
ul.tabs > li:hover { ul.tabs > li:hover {

Loading…
Cancel
Save