From: Sven Hoehn Date: Thu, 21 Dec 2017 18:31:06 +0000 (+0100) Subject: basic styling talk.ipfire.org X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7fccb1a468b9663c3fd46dc72a74065ae8e20b3e;p=ipfire.org.git basic styling talk.ipfire.org --- diff --git a/static/css/style.css b/static/css/style.css index 110f0c41..3cbae09b 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -5824,12 +5824,16 @@ h5.fireinfo { body.About li.nav-item a.about, body.Download li.nav-item a.download, body.Support li.nav-item a.support, - body.Involved li.nav-item a.community { + body.Involved li.nav-item a.community, + body.Phonebook li.nav-item a.phonebook, + body.Diagnosis li.nav-item a.diagnosis { color: #b71c1c; } body.About li.nav-item a.about:after, body.Download li.nav-item a.download:after, body.Support li.nav-item a.support:after, - body.Involved li.nav-item a.community:after { + body.Involved li.nav-item a.community:after, + body.Phonebook li.nav-item a.phonebook:after, + body.Diagnosis li.nav-item a.diagnosis:after { content: ""; border-bottom: 2px solid #b71c1c; position: absolute; diff --git a/static/scss/_nav.scss b/static/scss/_nav.scss index 48c024d0..837e4ea2 100644 --- a/static/scss/_nav.scss +++ b/static/scss/_nav.scss @@ -213,7 +213,9 @@ body.About li.nav-item a.about, body.Download li.nav-item a.download, body.Support li.nav-item a.support, -body.Involved li.nav-item a.community { +body.Involved li.nav-item a.community, +body.Phonebook li.nav-item a.phonebook, +body.Diagnosis li.nav-item a.diagnosis { @include media-breakpoint-up(lg) { color: $red_900; &:after { diff --git a/templates/modules/menu.html b/templates/modules/menu.html index 0afafb63..6a2e90fb 100644 --- a/templates/modules/menu.html +++ b/templates/modules/menu.html @@ -52,11 +52,11 @@ {% elif hostname == "talk.ipfire.org" and current_user %}
  • - {{ _("Phonebook") }} + {{ _("Phonebook") }}
  • - {{ _("Conferences") }} + {{ _("Conferences") }}
  • @@ -67,7 +67,7 @@ {% if current_user.is_admin() %}
  • - {{ _("Diagnosis") }} + {{ _("Diagnosis") }}
    • {% end %} {% end %} diff --git a/templates/talk/index.html b/templates/talk/index.html index 6e99cc3f..30c8c85f 100644 --- a/templates/talk/index.html +++ b/templates/talk/index.html @@ -3,11 +3,15 @@ {% block title %}{{ _("Index") }}{% end block %} {% block body %} -
    -

    {{ _("Hello, %s!") % current_user.first_name or current_user.name }}

    -
    - - {% if favourite_contacts %} +
    +
    +
    +
    +

    {{ _("Hello, %s!") % current_user.first_name or current_user.name }}

    +
    +
    + + {% if favourite_contacts %}
    {% for contact in favourite_contacts %}
    @@ -15,27 +19,25 @@
    - {% if contact.called_account %} -

    - - {{ contact.called_account.name }} - -

    - {% else %} -

    {{ contact.called }}

    - {% end %} - - {% if contact.called_account and contact.called_account.sip_is_online() %} - {{ _("Online") }} - {% else %} - {{ _("Offline") }} - {% end %} + {% if contact.called_account %} +

    + + {{ contact.called_account.name }} + +

    + {% else %} +

    {{ contact.called }}

    + {% end %} +

    + +

    @@ -43,9 +45,11 @@
    {% end %}
    - {% end %} + {% end %} {% module TalkOngoingCalls(current_user) %} {% module TalkCallLog(current_user) %} +
    +
    {% end block %} diff --git a/templates/talk/modules/call-log.html b/templates/talk/modules/call-log.html index b39a139b..fb9fe12c 100644 --- a/templates/talk/modules/call-log.html +++ b/templates/talk/modules/call-log.html @@ -1,6 +1,6 @@

    {{ _("Call Log") }}

    - +
    diff --git a/templates/talk/modules/lines.html b/templates/talk/modules/lines.html index 722ee13c..5192b54c 100644 --- a/templates/talk/modules/lines.html +++ b/templates/talk/modules/lines.html @@ -1,6 +1,6 @@

    {{ _("Lines") }}

    -
    {{ _("Date") }}
    +
    {% if show_account %} diff --git a/templates/talk/phonebook-contact.html b/templates/talk/phonebook-contact.html index facebf49..79856b32 100644 --- a/templates/talk/phonebook-contact.html +++ b/templates/talk/phonebook-contact.html @@ -3,17 +3,15 @@ {% block title %}{{ account.name }}{% end block %} {% block body %} -
    -

    {{ account.name }}

    -
    - -
    -
    -
    - {{ account.name }} +
    +
    +

    {{ account.name }}

    + +
    +
    + {{ account.name }}
    -
    +
    {% if account.sip_id %}

    {{ _("Voice over IP") }}

    @@ -21,11 +19,16 @@

  • {% if account.uses_sip_forwarding() %} - + + {{ account.sip_id }} {% elif account.sip_is_online() %} - + + + {{ account.sip_id }} {% else %} - + + + {{ account.sip_id }} {% end %} {{ account.sip_id }}

    @@ -54,6 +57,7 @@ {% if account.email %} {% end %}
    • -
    + +

    {{ _("Postal Address") }}

    {{ account.name }}
    @@ -94,19 +99,24 @@ {% end %}
    +
    -
    - - {% if current_user.is_admin() and account.uses_sip_forwarding() %} -
    +
    {% end block %} diff --git a/templates/talk/phonebook.html b/templates/talk/phonebook.html index ed7e9a77..18716f9b 100644 --- a/templates/talk/phonebook.html +++ b/templates/talk/phonebook.html @@ -3,56 +3,47 @@ {% block title %}{{ _("Phonebook") }}{% end block %} {% block body %} -
    -

    {{ _("Phonebook") }}

    -
    -
    -
    -
      - {% for e in phonebook %} -
    • -
      -
      -
      -

      - {{ e.name }} -

      -
      - -
      -
        -
      • - - {{ e.email }} -
        • - - {% if e.sip_id %} -
      • - {% if e.uses_sip_forwarding() %} - - {{ e.sip_id }} - {% elif e.sip_is_online() %} - - {{ e.sip_id }} - {% else %} - - {{ e.sip_id }} - {% end %} -
        • +
        +
        +

        {{ _("Phonebook") }}

        + +
        +
        +
    + + + + + + + + + + {% for e in phonebook %} + + + + + + + {% end %} + +
    NameeMailPhoneGravatar
    {{ e.name }} + {{ e.email }} + {% if e.sip_id %} + + {% if e.uses_sip_forwarding() %} + {{ e.sip_id }} + {% elif e.sip_is_online() %} + {{ e.sip_id }} + {% else %} + {{ e.sip_id }} {% end %} - - - - -
    - - {{ e.name }} - -
    - - {% end %} - - - + {% end %} +     		{{ e.name }}
    + + + + {% end block %}