diff --git a/app/Capability.php b/app/Capability.php index 61161f0a0..3423930a0 100644 --- a/app/Capability.php +++ b/app/Capability.php @@ -86,14 +86,14 @@ class Capability extends Model public function getDeviceIcon() { - if (in_array($this->type, ['handheld', 'phone'])) return 'zmdi-smartphone'; - if ($this->type == 'bot') return 'zmdi-memory'; + if (in_array($this->type, ['handheld', 'phone'])) return 'smartphone'; + if ($this->type == 'bot') return 'memory'; if ($this->type == 'web') { if ($this->type == 'web') { - return 'zmdi-cloud-outline'; + return 'cloud_queue'; } - return 'zmdi-globe-alt'; + return 'language'; } } diff --git a/app/views/conf.tpl b/app/views/conf.tpl index 9b8f07afe..1aae5bbfd 100644 --- a/app/views/conf.tpl +++ b/app/views/conf.tpl @@ -18,7 +18,7 @@ -

+

diff --git a/app/views/page.tpl b/app/views/page.tpl index 594a407ec..89620ab88 100644 --- a/app/views/page.tpl +++ b/app/views/page.tpl @@ -5,7 +5,7 @@ <?php $this->title(); ?> - + meta(); ?> @@ -37,12 +37,10 @@ $this->addCss('color.css'); $this->addCss('block.css'); $this->addCss('menu.css'); - $this->addCss('opensans.css'); $this->addCss('fonts.css'); $this->addCss('title.css'); $this->addCss('typo.css'); $this->addCss('scrollbar.css'); - $this->addCss('material-design-iconic-font.min.css'); $this->scripts(); ?> diff --git a/app/widgets/About/about.tpl b/app/widgets/About/about.tpl index 394921aad..8231bfbe5 100644 --- a/app/widgets/About/about.tpl +++ b/app/widgets/About/about.tpl @@ -1,7 +1,7 @@
diff --git a/app/widgets/Account/account.tpl b/app/widgets/Account/account.tpl index 0bff51e75..5d63a65b4 100644 --- a/app/widgets/Account/account.tpl +++ b/app/widgets/Account/account.tpl @@ -7,10 +7,10 @@ {loop="$gateway"}
  • - + swap_horiz - + chevron_right

    {$value->name}

    {$value->node}

    @@ -24,7 +24,7 @@
  • - + vpn_key
    @@ -47,24 +47,24 @@
  • - + eject - + chevron_right -

    {$c->__('account.clear')}

    +

    {$c->__('account.clear')}

  • {$c->__('account.delete')}

  • - + delete - + chevron_right -

    {$c->__('account.delete')}

    +

    {$c->__('account.delete')}

  • diff --git a/app/widgets/AdHoc/AdHoc.php b/app/widgets/AdHoc/AdHoc.php index cb3ca0453..3627886db 100644 --- a/app/widgets/AdHoc/AdHoc.php +++ b/app/widgets/AdHoc/AdHoc.php @@ -113,24 +113,24 @@ class AdHoc extends \Movim\Widget\Base function getIcon($command) { $icons = [ - 'http://jabber.org/protocol/admin#delete-user' => 'zmdi-delete', - 'http://jabber.org/protocol/admin#end-user-session' => 'zmdi-stop', - 'http://jabber.org/protocol/admin#change-user-password' => 'zmdi-lock', - 'ping' => 'zmdi-swap', - 'http://jabber.org/protocol/admin#shutdown' => 'zmdi-power-off', - 'http://jabber.org/protocol/admin#add-user' => 'zmdi-account-add', - 'http://jabber.org/protocol/admin#user-stats' => 'zmdi-accounts', - 'uptime' => 'zmdi-time', - 'http://jabber.org/protocol/admin#server-buddy' => 'zmdi-stop', - 'http://jabber.org/protocol/admin#get-user-roster' => 'zmdi-format-list-bulleted', - 'http://jabber.org/protocol/admin#get-online-users' => 'zmdi-trending-up', - 'http://jabber.org/protocol/admin#announce' => 'zmdi-notifications', + 'http://jabber.org/protocol/admin#delete-user' => 'delete', + 'http://jabber.org/protocol/admin#end-user-session' => 'stop', + 'http://jabber.org/protocol/admin#change-user-password' => 'lock', + 'ping' => 'swap_horiz', + 'http://jabber.org/protocol/admin#shutdown' => 'power_off', + 'http://jabber.org/protocol/admin#add-user' => 'person_add', + 'http://jabber.org/protocol/admin#user-stats' => 'people', + 'uptime' => 'timer', + 'http://jabber.org/protocol/admin#server-buddy' => 'stop', + 'http://jabber.org/protocol/admin#get-user-roster' => 'format_list_bulleted', + 'http://jabber.org/protocol/admin#get-online-users' => 'trending_up', + 'http://jabber.org/protocol/admin#announce' => 'notifications', ]; if (array_key_exists($command, $icons)) { return $icons[$command]; } - return 'zmdi-chevron-right'; + return 'chevron_right'; } } diff --git a/app/widgets/AdHoc/_adhoc_list.tpl b/app/widgets/AdHoc/_adhoc_list.tpl index ea6fed6ee..ca16176b2 100644 --- a/app/widgets/AdHoc/_adhoc_list.tpl +++ b/app/widgets/AdHoc/_adhoc_list.tpl @@ -8,10 +8,10 @@ {if="isset($value->attributes()->name)"}
  • - + {$c->getIcon((string)$value->attributes()->node)} - + chevron_right

    {$value->attributes()->name} diff --git a/app/widgets/AdminMain/adminmain.tpl b/app/widgets/AdminMain/adminmain.tpl index 5e8761305..5c288054f 100644 --- a/app/widgets/AdminMain/adminmain.tpl +++ b/app/widgets/AdminMain/adminmain.tpl @@ -100,7 +100,7 @@