Merge pull request #63 from H2-invent/feature/scrollable_admin_modal

add modal features in admin modal
H2-invent · Feb 10, 2021 · 5db9d34 · 5db9d34
2 parents d761072 + 53aa5b5
commit 5db9d34
Show file tree

Hide file tree

Showing 7 changed files with 41 additions and 20 deletions.
diff --git a/assets/css/style.css b/assets/css/style.css
@@ -613,13 +613,16 @@ label.required:after {
 }
 .iconSytle{
     max-height: 25px;
-    background-color: white;
+}
+
+.iconSytle:Hover {
+    webkit-filter: drop-shadow(2px 2px 3px #9C9C9C);
+    filter: drop-shadow(2px 2px 3px #9c9c9c);
 }
 
 @media only screen and (min-width: 768px) {
     .iconSytle {
         max-height: 30px;
-        background-color: white;
     }
 }
 .breakWord{

diff --git a/public/images/logout.svg b/public/images/logout.svg
diff --git a/public/images/settings.svg b/public/images/settings.svg
diff --git a/public/logo.png b/public/logo.png
diff --git a/templates/admin/modalChart.html.twig b/templates/admin/modalChart.html.twig
@@ -1,4 +1,4 @@
-<div class="modal-dialog modal-xl modal-dialog-centered">
+<div class="modal-dialog modal-xl modal-dialog-centered modal-dialog-scrollable">
     <div class="modal-content">
 
         <div class="modal-header  light-blue darken-3 white-text">
@@ -35,7 +35,8 @@
                     </div>
                 </div>
                 <div class="col-md-6 col-sm-6 col-lg-3 mb-2">
-                    <a href="https://github.com/H2-invent/jitsi-admin/releases/tag/{{ tags[0].name }}" referrerpolicy="no-referrer " target="_blank" rel="noreferrer noopener">
+                    <a href="https://github.com/H2-invent/jitsi-admin/releases/tag/{{ tags[0].name }}"
+                       referrerpolicy="no-referrer " target="_blank" rel="noreferrer noopener">
                         <div class="card {% if laf_version != tags[0].name %}border-danger{% else %}border-info{% endif %} text-center">
                             <div class="card-body">
                                 {% if laf_version != tags[0].name %}{{ 'Neue Version von Jitsi Admin verfügbar'|trans }}{% else %}{{ 'Aktuellste Jitsi Admin Version installiert'|trans }}{% endif %}
@@ -57,6 +58,7 @@
         labels: [{% for date in chart %}"{{ date['date']|date('d.m.Y') }}",{% endfor %}],
         datasets: [{
             label: "{{ 'Anzahl Konferenzen'|trans }}",
+            yAxisID: 'A',
             data: [{% for date in chart %}"{{ date['rooms'] }}",{% endfor %}],
             backgroundColor: [
                 'rgba(105, 0, 132, .2)',
@@ -68,6 +70,7 @@
         },
             {
                 label: "{{ 'Anzahl Teilnehmer'|trans }}",
+                yAxisID: 'B',
                 data: [{% for date in chart %}"{{ date['participants'] }}",{% endfor %}],
                 backgroundColor: [
                     'rgba(0, 137, 132, .2)',
@@ -80,7 +83,24 @@
         ]
     };
     options = {
-        responsive: true
+        responsive: true,
+        scales: {
+            yAxes: [{
+                id: 'A',
+                type: 'linear',
+                position: 'left',
+                ticks: {
+                    min: 0
+                }
+            }, {
+                id: 'B',
+                type: 'linear',
+                position: 'right',
+                ticks: {
+                    min: 0
+                }
+            }]
+        }
     };
 
 </script>
diff --git a/templates/base.html.twig b/templates/base.html.twig
@@ -13,9 +13,9 @@
             <div class="container-fluid">
                 <a href="{{ path('dashboard') }}">
                     <img class="d-none d-md-block" src="{{ asset('logo.png') }}" alt="Logo"
-                         style="height: 80px; width: auto">
-                    <img class="d-block d-md-none" src="{{ asset('logo.png') }}" alt="Logo"
                          style="height: 40px; width: auto">
+                    <img class="d-block d-md-none" src="{{ asset('logo.png') }}" alt="Logo"
+                         style="height: auto; width: 150px">
                 </a>
                 {% block CTA %}{% endblock %}
                 {{ include('base/__topnav.html.twig') }}

diff --git a/templates/base/__topnav.html.twig b/templates/base/__topnav.html.twig
@@ -1,30 +1,30 @@
 <ul class="nav navbar-nav ml-auto">
     <div class="row mr-1">
         <!-- Button trigger modal -->
-        <a class="ml-auto mr-2"
+        <a class="ml-auto mr-2 mr-sm-4"
            href="{{ helpUrl }}" target="_blank">
-            <img src="{{ asset('images/question.png') }}" class="iconSytle">
+            <img src="{{ asset('images/question.png') }}" class="iconSytle" title="{{ 'Hilfe'|trans }}">
         </a>
 
 
-        <a class="ml-auto mr-2"
+        <a class="ml-auto mr-2 mr-sm-4"
                 data-toggle="modal"
                 data-target="#modalAdressbook">
-            <img src="{{ asset('images/agenda.png') }}" class="iconSytle">
+            <img src="{{ asset('images/agenda.png') }}" class="iconSytle" title="{{ 'Adressbuch'|trans }}">
         </a>
-        <a class="ml-auto mr-2"
+        <a class="ml-auto mr-2 mr-sm-4"
            data-toggle="modal"
            data-target="#settings">
-            <img src="{{ asset('images/settings.png') }}" class="iconSytle">
+            <img src="{{ asset('images/settings.svg') }}" class="iconSytle" title="{{ 'Jitsi Meet Servereinstellungen'|trans }}">
         </a>
         <!-- Button trigger modal -->
-        <a class="ml-auto mr-2"
+        <a class="ml-auto mr-2 mr-sm-4"
            data-toggle="modal"
            data-target="#sideModalTR">
-            <img src="{{ asset('images/profil.svg') }}" class="iconSytle">
+            <img src="{{ asset('images/profil.svg') }}" class="iconSytle" title="{{ 'Profil'|trans }}">
         </a>
 
-        <a href="{{ path('app_logout') }}"><img src="{{ asset('images/logout.svg') }}" class="iconSytle"></a>
+        <a href="{{ path('app_logout') }}"><img src="{{ asset('images/logout.svg') }}" class="iconSytle" title="{{ 'Logout'|trans }}"></a>
 
     </div>