Browse Source
- Move page Account to the new theme
- Move page Account to the new theme
- Write CSS for the select form elements - Write the chat selector list - Fix little CSS issues - Fix the login pagepull/16/head
37 changed files with 689 additions and 356 deletions
-
2app/assets/js/movim_websocket.js
-
13app/views/account.tpl
-
14app/views/accountnext.tpl
-
2app/views/chat.tpl
-
2app/views/conf.tpl
-
1app/views/contact.tpl
-
6app/views/help.tpl
-
16app/widgets/AccountNext/_accountnext_form.tpl
-
6app/widgets/AccountNext/accountnext.tpl
-
8app/widgets/Chat/Chat.php
-
10app/widgets/Chat/_chat.tpl
-
2app/widgets/Chat/_chat_header.tpl
-
2app/widgets/Chat/_chat_messages.tpl
-
6app/widgets/Chat/chat.js
-
65app/widgets/Chats/Chats.php
-
11app/widgets/Chats/_chats.tpl
-
28app/widgets/Chats/chats.js
-
8app/widgets/Chats/chats.tpl
-
9app/widgets/Config/_config_form.tpl
-
20app/widgets/Contact/Contact.php
-
8app/widgets/Contact/_contact.tpl
-
6app/widgets/Header/_header_account.tpl
-
6app/widgets/Header/_header_accountnext.tpl
-
5app/widgets/Header/_header_help.tpl
-
43app/widgets/Login/_login_sessions.tpl
-
2app/widgets/Login/locales.ini
-
57app/widgets/Login/login.css
-
177app/widgets/Login/login.js
-
127app/widgets/Login/login.tpl
-
3app/widgets/Subscribe/subscribe.css
-
67app/widgets/Subscribe/subscribe.tpl
-
94app/widgets/Vcard4/_vcard4_form.tpl
-
10themes/material/css/block.css
-
22themes/material/css/color.css
-
41themes/material/css/form.css
-
32themes/material/css/list.css
-
114themes/material/css/style.css
@ -1,9 +1,6 @@ |
|||
<?php /* -*- mode: html -*- */ |
|||
?> |
|||
<div id="main"> |
|||
<div id="left"> |
|||
</div> |
|||
<div id="center"> |
|||
<main> |
|||
<?php $this->widget('Header'); ?> |
|||
<section> |
|||
<?php $this->widget('Subscribe');?> |
|||
</div> |
|||
</div> |
|||
</section> |
|||
</main> |
@ -1,10 +1,6 @@ |
|||
<?php /* -*- mode: html -*- */ |
|||
?> |
|||
<div id="main"> |
|||
<div id="left"> |
|||
<?php $this->widget('AccountError');?> |
|||
</div> |
|||
<div id="center"> |
|||
<main> |
|||
<?php $this->widget('Header'); ?> |
|||
<section> |
|||
<?php $this->widget('AccountNext');?> |
|||
</div> |
|||
</div> |
|||
</section> |
|||
</main> |
@ -0,0 +1,11 @@ |
|||
{loop="$chats"} |
|||
<li data-jid="{$value->jid}"> |
|||
<div class="control"> |
|||
<i class="md md-chevron-right"></i> |
|||
</div> |
|||
<span class="icon bubble"> |
|||
<img src="{$value->getPhoto('s')}"> |
|||
</span> |
|||
<span>{$value->getTrueName()}</span> |
|||
</li> |
|||
{/loop} |
@ -0,0 +1,28 @@ |
|||
var Chats = { |
|||
refresh: function() { |
|||
var items = document.querySelectorAll('ul#chats_widget_list li'); |
|||
var i = 0; |
|||
while(i < items.length) |
|||
{ |
|||
items[i].onclick = function(e) { |
|||
MovimTpl.showPanel(); |
|||
Chat_ajaxGet(this.dataset.jid); |
|||
Chats.reset(items); |
|||
movim_add_class(this, 'active'); |
|||
} |
|||
i++; |
|||
} |
|||
|
|||
items[0].click(); |
|||
}, |
|||
|
|||
reset: function(list) { |
|||
for(i = 0; i < list.length; i++) { |
|||
movim_remove_class(list[i], 'active'); |
|||
} |
|||
} |
|||
} |
|||
|
|||
MovimWebsocket.attach(function() { |
|||
Chats.refresh(); |
|||
}); |
@ -0,0 +1,8 @@ |
|||
<div id="chats_widget"> |
|||
<ul id="chats_widget_list" class="thick active divided"> |
|||
{$list} |
|||
</ul> |
|||
<a class="button action color"> |
|||
<i class="md md-playlist-add"></i> |
|||
</a> |
|||
</div> |
@ -0,0 +1,6 @@ |
|||
<header id="header"> |
|||
<a href="{$c->route('main')}" class="classic"> |
|||
<span id="menu" class="icon"><i class="md md-home"></i></span> |
|||
</a> |
|||
<h2>{$c->__('page.account_creation')}</h2> |
|||
</header> |
@ -0,0 +1,6 @@ |
|||
<header id="header"> |
|||
<a href="{$c->route('account')}" class="classic"> |
|||
<span id="menu" class="icon"><i class="md md-arrow-back"></i></span> |
|||
</a> |
|||
<h2>{$c->__('page.account_creation')}</h2> |
|||
</header> |
@ -0,0 +1,5 @@ |
|||
<header id="header"> |
|||
<span id="menu" class="on_mobile icon" onclick="MovimTpl.showMenu()"><i class="md md-menu"></i></span> |
|||
<span class="on_desktop icon"><i class="md md-help"></i></span> |
|||
<h2>{$c->__('page.help')}</h2> |
|||
</header> |
@ -1,20 +1,23 @@ |
|||
<ul class="active"> |
|||
<li class="subheader">{$c->__('account.title')}</li> |
|||
{loop="$sessions"} |
|||
<li onclick="chooseSession('{$value->jid}')"> |
|||
<div class="control"> |
|||
<i onclick="removeSession('{$value->jid}')" class="fa fa-times"></i> |
|||
</div> |
|||
<span class="icon bubble"> |
|||
<img src="{$value->getPhoto('s')}"/> |
|||
</span> |
|||
<span onclick="chooseSession('{$value->jid}')">{$value->getTrueName()}</span> |
|||
</li> |
|||
{/loop} |
|||
<li> |
|||
<span class="icon bubble color green"> |
|||
<i class="md md-face-unlock"></i> |
|||
</span> |
|||
<span onclick="chooseSession('')">{$c->__('form.another_account')}</span> |
|||
</li> |
|||
</ul> |
|||
<section> |
|||
<h3>{$c->__('account.title')}</h3> |
|||
<br /> |
|||
<ul class="active"> |
|||
{loop="$sessions"} |
|||
<li> |
|||
<div class="control"> |
|||
<i onclick="Login.removeSession('{$value->jid}')" class="fa fa-times"></i> |
|||
</div> |
|||
<span class="icon bubble"> |
|||
<img src="{$value->getPhoto('s')}"/> |
|||
</span> |
|||
<span onclick="Login.choose('{$value->jid}')">{$value->getTrueName()}</span> |
|||
</li> |
|||
{/loop} |
|||
</ul> |
|||
</section> |
|||
<div> |
|||
<a class="button flat" href="{$c->route('admin')}"> |
|||
<i class="md md-pages"></i> |
|||
</a> |
|||
<span class="button flat" onclick="Login.choose('')">{$c->__('form.another_account')}</span> |
|||
</div> |
@ -1,37 +1,48 @@ |
|||
<div id="subscribe"> |
|||
<h1 class="paddedtopbottom">{$c->__('subscribe.title')}</h1> |
|||
|
|||
<p class="paddedtopbottom">{$c->__('subscribe.info')}</p> |
|||
<h4>{$c->__('subscribe.info')}</h4> |
|||
|
|||
{loop="$servers"} |
|||
<div |
|||
class="block" |
|||
onclick="movim_redirect('{$c->route('accountnext', array($value->fn->text, false))}')"> |
|||
<div class="server {if="$value->checked"}star{/if}"> |
|||
<h1>{$value->fn->text}</h1> |
|||
|
|||
<img |
|||
class="flag" |
|||
title="{$value->adr->country}" |
|||
alt="{$value->adr->country}" |
|||
src="{$c->flagPath($value->adr->country)}"/> |
|||
<p>{$value->note->text}</p> |
|||
|
|||
<a target="_blank" href="{$value->url->uri}"> |
|||
{$value->url->uri} |
|||
</a> |
|||
</div> |
|||
</div> |
|||
{/loop} |
|||
|
|||
<div class="block"> |
|||
<div class="server"> |
|||
<h1>{$c->__('subscribe.server_question')}</h1> |
|||
<ul class="thick active"> |
|||
{loop="$servers"} |
|||
<li |
|||
class="block condensed" |
|||
onclick="movim_redirect('{$c->route('accountnext', array($value->fn->text, false))}')"> |
|||
<span class="icon bubble color {$value->fn->text|stringToColor}"> |
|||
{if="$value->checked"} |
|||
<i class="fa md-star-outline"></i> |
|||
{else} |
|||
{$value->fn->text|firstLetterCapitalize} |
|||
{/if} |
|||
</span> |
|||
<div class="server {if="$value->checked"}star{/if}"> |
|||
<span class="info"> |
|||
<img |
|||
class="flag" |
|||
title="{$value->adr->country}" |
|||
alt="{$value->adr->country}" |
|||
src="{$c->flagPath($value->adr->country)}"/> |
|||
</span> |
|||
<span>{$value->fn->text}</span> |
|||
|
|||
<p> |
|||
{$value->note->text}<br /> |
|||
<a target="_blank" href="{$value->url->uri}"> |
|||
{$value->url->uri} |
|||
</a> |
|||
</p> |
|||
</div> |
|||
</li> |
|||
{/loop} |
|||
|
|||
<li class="block condensed"> |
|||
<span class="icon bubble color orange"> |
|||
<i class="md md-add-circle-outline"></i> |
|||
</span> |
|||
<span>{$c->__('subscribe.server_question')}</span> |
|||
<p> |
|||
{$c->__('subscribe.server_contact')} • <a href="http://movim.eu/">http://movim.eu/</a> |
|||
</p> |
|||
</div> |
|||
</div> |
|||
</li> |
|||
</ul> |
|||
</div> |
|||
|
Write
Preview
Loading…
Cancel
Save
Reference in new issue