Browse Source

- Fix placeholder pics

- Fix account registration CSS and placeholder
- Add placeholder in the chat
- Fix the post placeholder
pull/16/head
Jaussoin Timothée 11 years ago
parent
commit
5f0c19f0ac
  1. 1
      app/widgets/AccountNext/AccountNext.php
  2. 8
      app/widgets/AccountNext/_accountnext_registered.tpl
  3. 4
      app/widgets/AccountNext/accountnext.css
  4. 1
      app/widgets/AccountNext/accountnext.tpl
  5. 7
      app/widgets/Chats/_chats.tpl
  6. 24
      app/widgets/Chats/chats.js
  7. 3
      app/widgets/Chats/locales.ini
  8. 7
      app/widgets/Post/_post_empty.tpl
  9. 20
      themes/material/css/style.css
  10. BIN
      themes/material/img/placeholder/chat.png
  11. BIN
      themes/material/img/placeholder/clipboard.png
  12. BIN
      themes/material/img/placeholder/explore.png
  13. BIN
      themes/material/img/placeholder/file.png
  14. BIN
      themes/material/img/placeholder/media.png
  15. BIN
      themes/material/img/placeholder/newspaper.png
  16. BIN
      themes/material/img/placeholder/plane.png

1
app/widgets/AccountNext/AccountNext.php

@ -8,6 +8,7 @@ class AccountNext extends WidgetBase {
function load()
{
$this->addjs('accountnext.js');
$this->addcss('accountnext.css');
$this->registerEvent('register_get_handle', 'onForm');
$this->registerEvent('register_set_handle', 'onRegistered');

8
app/widgets/AccountNext/_accountnext_registered.tpl

@ -1,9 +1,9 @@
<div class="placeholder icon clipboard">
{$c->__('create.successfull')}
<h4>{$c->__('create.successfull')}</h4>
<h1 id="username">username@server.com</h1>
<h2 id="username">username@server.com</h2>
<a class="button color green" href="{$c->route('login')}">
<i class="fa fa-home"></i> {$c->__('page.login')}
<a class="button color" href="{$c->route('login')}">
{$c->__('page.login')}
</a>
</div>

4
app/widgets/AccountNext/accountnext.css

@ -1 +1,3 @@
#subscription_form form > div {
padding-left: 2rem;
}

1
app/widgets/AccountNext/accountnext.tpl

@ -7,7 +7,6 @@
</li>
</ul>
</div>
<script type="text/javascript">
MovimWebsocket.attach(function()
{

7
app/widgets/Chats/_chats.tpl

@ -1,3 +1,10 @@
{if="$chats == null"}
<li class="condensed">
<span class="icon bubble color green"><i class="md md-chat"></i></span>
<p>{$c->__('chats.empty')}</p>
</li>
{/if}
{loop="$chats"}
<li
data-jid="{$value->jid}"

24
app/widgets/Chats/chats.js

@ -4,18 +4,20 @@ var Chats = {
var i = 0;
while(i < items.length)
{
items[i].onclick = function(e) {
Chat_ajaxGet(this.dataset.jid);
Chats.reset(items);
Notification_ajaxClear('chat|' + this.dataset.jid);
Notification_ajaxCurrent('chat|' + this.dataset.jid);
movim_add_class(this, 'active');
}
if(items[i].dataset.jid != null) {
items[i].onclick = function(e) {
Chat_ajaxGet(this.dataset.jid);
Chats.reset(items);
Notification_ajaxClear('chat|' + this.dataset.jid);
Notification_ajaxCurrent('chat|' + this.dataset.jid);
movim_add_class(this, 'active');
}
items[i].onmousedown = function(e) {
if(e.which == 2) {
Chats_ajaxClose(this.dataset.jid);
MovimTpl.hidePanel();
items[i].onmousedown = function(e) {
if(e.which == 2) {
Chats_ajaxClose(this.dataset.jid);
MovimTpl.hidePanel();
}
}
}

3
app/widgets/Chats/locales.ini

@ -1,3 +1,6 @@
[chats]
chats.empty = 'Open a new conversation here by clicking on the plus button bellow'
[message]
message.encrypted = 'Encrypted message'

7
app/widgets/Post/_post_empty.tpl

@ -1,7 +1,4 @@
<div>
<div class="placeholder icon newspaper">
<h1>{$c->__('post.news_feed')}</h1>
<h2>{$c->__('post.placeholder')}</h2>
<a class="button color orange" href="{$c->route('explore')}">
{$c->__('page.explore')}
</a>
<h4>{$c->__('post.placeholder')}</h4>
</div>

20
themes/material/css/style.css

@ -271,7 +271,7 @@ main > header + section {
main > section > div {
overflow-y: auto;
display: block;
position: relative;
/*position: relative;*/
float: left;
height: 100%;
width: 100%;
@ -672,19 +672,19 @@ main section > div:first-child:nth-last-child(2) ~ div .actions.fixed > div:last
}
.placeholder.icon {
background-image: url(../img/icons/placeholder/chat.png);
background-size: 35%;
padding-top: 12em;
background-image: url(../img/placeholder/chat.png);
background-size: 25rem;
padding-top: 26rem;
background-repeat: no-repeat;
background-position: center 1em;
}
.placeholder.icon.newspaper { background-image: url(../img/icons/placeholder/newspaper.png); }
.placeholder.icon.media { background-image: url(../img/icons/placeholder/media.png); }
.placeholder.icon.explore { background-image: url(../img/icons/placeholder/explore.png); }
.placeholder.icon.plane { background-image: url(../img/icons/placeholder/plane.png); }
.placeholder.icon.file { background-image: url(../img/icons/placeholder/file.png); }
.placeholder.icon.clipboard { background-image: url(../img/icons/placeholder/clipboard.png); }
.placeholder.icon.newspaper { background-image: url(../img/placeholder/newspaper.png); }
.placeholder.icon.media { background-image: url(../img/placeholder/media.png); }
.placeholder.icon.explore { background-image: url(../img/placeholder/explore.png); }
.placeholder.icon.plane { background-image: url(../img/placeholder/plane.png); }
.placeholder.icon.file { background-image: url(../img/placeholder/file.png); }
.placeholder.icon.clipboard { background-image: url(../img/placeholder/clipboard.png); }
/* Definition list */

BIN
themes/material/img/placeholder/chat.png

After

Width: 512  |  Height: 512  |  Size: 4.6 KiB

BIN
themes/material/img/placeholder/clipboard.png

After

Width: 512  |  Height: 512  |  Size: 8.3 KiB

BIN
themes/material/img/placeholder/explore.png

After

Width: 512  |  Height: 512  |  Size: 28 KiB

BIN
themes/material/img/placeholder/file.png

After

Width: 512  |  Height: 512  |  Size: 3.6 KiB

BIN
themes/material/img/placeholder/media.png

After

Width: 512  |  Height: 512  |  Size: 10 KiB

BIN
themes/material/img/placeholder/newspaper.png

After

Width: 512  |  Height: 512  |  Size: 4.5 KiB

BIN
themes/material/img/placeholder/plane.png

After

Width: 512  |  Height: 512  |  Size: 23 KiB

Loading…
Cancel
Save