- Fixen von div. Javascriptbugs beim Ausloggen

- Graph Darstellung auf standard von 10 tagen eingestellt

Application/scf/Core/StatsGenerator.php

@@ -102,7 +102,7 @@ class StatsGenerator {
         $genStart = new \DateTime($dateValue);
         $interval = new \DateInterval('P1D');
         if(is_numeric($range)) {
-            $range = ($range > 30 ? 30 : $range);
+            $range = ($range > 100 ? 100 : $range);
             $genStart = $genStart->modify("-" . $range . " days");
             $genEnd = clone $genStart;
             $genEnd = $genEnd->modify("+" .($range+1)." days");
@@ -141,7 +141,7 @@ class StatsGenerator {
         $genStart = new \DateTime($dateValue);
         $interval = new \DateInterval('P1D');
         if(is_numeric($range)) {
-            $range = ($range > 30 ? 30 : $range);
+            $range = ($range > 100 ? 100 : $range);
             $genStart = $genStart->modify("-" . $range . " days");
             $genEnd = clone $genStart;
             $genEnd = $genEnd->modify("+" . ($range * 2) . " days");
@@ -181,7 +181,7 @@ class StatsGenerator {
         $day = (!empty($day) ? $day : date("d", time()));
         $month = (!empty($month) ? $month : date("m", time()));
         $year = (!empty($year) ? $year : date("Y", time()));
-        $range =(!empty($range) ? $range : 5);
+        $range =(!empty($range) ? $range : 10);
         $this->dateLabels = $this->generateLabels($day,$month,$year,$range);
     }
 
@@ -206,7 +206,7 @@ class StatsGenerator {
         $day = (!empty($day) ? $day : date("d", time()));
         $month = (!empty($month) ? $month : date("m", time()));
         $year = (!empty($year) ? $year : date("Y", time()));
-        $range =(!empty($range) ? $range : 5);
+        $range =(!empty($range) ? $range : 10);
         $this->userDateRows = $this->generateRows($type, $day,$month,$year,$range);
     }
 
@@ -223,7 +223,7 @@ class StatsGenerator {
         $day = (!empty($day) ? $day : date("d", time()));
         $month = (!empty($month) ? $month : date("m", time()));
         $year = (!empty($year) ? $year : date("Y", time()));
-        $range =(!empty($range) ? $range : 5);
+        $range =(!empty($range) ? $range : 10);
         $this->downloadDateRows = $this->generateRows($type, $day,$month,$year,$range);
     }
     /**

Application/templates/SmartAdmin/Data/specific/sternenkindsaga.tpl

@@ -18,28 +18,10 @@
     </li>
 {/block}
 {block name="body"}
-    <!-- widget grid -->
     <section id="widget-grid" class="">
-
-        <!-- row -->
         <div class="row">
-
                 <article class="col-sm-6">
-                    <!-- new widget -->
                     <div class="jarviswidget jarviswidget-color-blueLight" id="wid-id-0" data-widget-togglebutton="false" data-widget-editbutton="false" data-widget-fullscreenbutton="false" data-widget-colorbutton="false" data-widget-deletebutton="false">
-                        <!-- widget options:
-                        usage: <div class="jarviswidget" id="wid-id-0" data-widget-editbutton="false">
-
-                        data-widget-colorbutton="false"
-                        data-widget-editbutton="false"
-                        data-widget-togglebutton="false"
-                        data-widget-deletebutton="false"
-                        data-widget-fullscreenbutton="false"
-                        data-widget-custombutton="false"
-                        data-widget-collapsed="true"
-                        data-widget-sortable="false"
-
-                        -->
                         <header>
                             <span class="widget-icon"> <i class="fa fa-line-chart txt-color-darken"></i> </span>
                             <h2>Besucher pro Tag Statistik</h2>
@@ -55,64 +37,51 @@
                     </div>
                 </article>
 
-            <article class="col-sm-6">
-                <!-- new widget -->
-                <div class="jarviswidget jarviswidget-color-blueLight" id="wid-id-1" data-widget-togglebutton="false" data-widget-editbutton="false" data-widget-fullscreenbutton="false" data-widget-colorbutton="false" data-widget-deletebutton="false">
-                    <!-- widget options:
-                    usage: <div class="jarviswidget" id="wid-id-0" data-widget-editbutton="false">
-
-                    data-widget-colorbutton="false"
-                    data-widget-editbutton="false"
-                    data-widget-togglebutton="false"
-                    data-widget-deletebutton="false"
-                    data-widget-fullscreenbutton="false"
-                    data-widget-custombutton="false"
-                    data-widget-collapsed="true"
-                    data-widget-sortable="false"
+                <article class="col-sm-6">
+                    <div class="jarviswidget jarviswidget-color-blueLight" id="wid-id-1" data-widget-togglebutton="false" data-widget-editbutton="false" data-widget-fullscreenbutton="false" data-widget-colorbutton="false" data-widget-deletebutton="false">
 
-                    -->
-                    <header>
-                        <span class="widget-icon"> <i class="fa fa-info-circle txt-color-darken"></i> </span>
-                        <h2>Statistik</h2>
-                    </header>
+                        <header>
+                            <span class="widget-icon"> <i class="fa fa-info-circle txt-color-darken"></i> </span>
+                            <h2>Statistik</h2>
+                        </header>
 
-                    <div class="no-padding">
+                        <div class="no-padding">
 
-                        <div class="widget-body" style="padding-top: 20px;">
-                            <table class="table table-bordered">
-                                <thead>
-                                    <tr>
-                                        <th>Bezeichnung:</th>
-                                        <th>Gesamt:</th>
-                                        <th>Letzte 7 Tage</th>
-                                        <th>Letzten 30 Tage</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td>Downloads:</td>
-                                        <td><span class="btn btn-xs btn-default" id="allDls">{$allDownloads}</span></td>
-                                        <td><span class="label label-danger">Coming Soon</span></td>
-                                        <td><span class="label label-danger">Coming Soon</span></td>
-                                    </tr>
-                                    <tr>
-                                        <td>Besucher:</td>
-                                        <td><span class="btn btn-xs btn-default" id="allVisits">{$allVisitors}</span></td>
-                                        <td><span class="label label-danger">Coming Soon</span></td>
-                                        <td><span class="label label-danger">Coming Soon</span></td>
-                                    </tr>
-                                    <tr>
-                                        <td>Traffic:</td>
-                                        <td>{$traffic} GB</td>
-                                        <td><span class="label label-danger">Coming Soon</span></td>
-                                        <td><span class="label label-danger">Coming Soon</span></td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                            <div class="widget-body" style="padding-top: 20px;">
+                                <table class="table table-bordered">
+                                    <thead>
+                                        <tr>
+                                            <th>Bezeichnung:</th>
+                                            <th>Gesamt:</th>
+                                            <th>Letzte 7 Tage</th>
+                                            <th>Letzten 30 Tage</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <td>Downloads:</td>
+                                            <td><span class="btn btn-xs btn-default" id="allDls">{$allDownloads}</span></td>
+                                            <td><span class="label label-danger">Coming Soon</span></td>
+                                            <td><span class="label label-danger">Coming Soon</span></td>
+                                        </tr>
+                                        <tr>
+                                            <td>Besucher:</td>
+                                            <td><span class="btn btn-xs btn-default" id="allVisits">{$allVisitors}</span></td>
+                                            <td><span class="label label-danger">Coming Soon</span></td>
+                                            <td><span class="label label-danger">Coming Soon</span></td>
+                                        </tr>
+                                        <tr>
+                                            <td>Traffic:</td>
+                                            <td>{$traffic} GB</td>
+                                            <td><span class="label label-danger">Coming Soon</span></td>
+                                            <td><span class="label label-danger">Coming Soon</span></td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
                     </div>
-                </div>
-            </article>
+                </article>
         </div>
         <div class="row" id="ajaxReq">
             {block name="ajaxAppend"}{/block}

Application/templates/SmartAdmin/ajax/downloadOverview.tpl

@@ -1,35 +1,37 @@
 {block name="ajaxAppend"}
-        <script src="lib/SmartAdmin/js/libs/jquery-2.1.1.min.js"></script>
-        <script src="lib/SmartAdmin/js/plugin/datatables/jquery.dataTables.min.js"></script>
-        <script src="lib/SmartAdmin/js/plugin/datatables/dataTables.bootstrap.min.js"></script>
-        <script src="lib/SmartAdmin/js/ajax/dataTable.js"></script>
-        <article class="col-sm-12">
-            <!-- new widget -->
-            <div class="jarviswidget jarviswidget-color-blueLight" id="wid-id-0" data-widget-togglebutton="false" data-widget-editbutton="false" data-widget-fullscreenbutton="false" data-widget-colorbutton="false" data-widget-deletebutton="false">
-                <header>
-                    <span class="widget-icon"> <i class="fa fa-line-chart txt-color-darken"></i> </span>
-                    <h2>Nutzerinformationen &uuml;ber die Downloads</h2>
-                </header>
+    <script src="lib/SmartAdmin/js/libs/jquery-2.1.1.min.js"></script>
+    <script src="lib/SmartAdmin/js/plugin/datatables/jquery.dataTables.min.js"></script>
+    <script src="lib/SmartAdmin/js/plugin/datatables/dataTables.bootstrap.min.js"></script>
+    <script src="lib/SmartAdmin/js/ajax/dataTable.js"></script>
+    <script src="lib/SmartAdmin/js/notification/SmartNotification.min.js"></script>
 
-                <div class="no-padding">
+    <article class="col-sm-12">
+        <!-- new widget -->
+        <div class="jarviswidget jarviswidget-color-blueLight" id="wid-id-0" data-widget-togglebutton="false" data-widget-editbutton="false" data-widget-fullscreenbutton="false" data-widget-colorbutton="false" data-widget-deletebutton="false">
+            <header>
+                <span class="widget-icon"> <i class="fa fa-line-chart txt-color-darken"></i> </span>
+                <h2>Nutzerinformationen &uuml;ber die Downloads</h2>
+            </header>
 
-                    <div class="widget-body">
-                        <div class="alert alert-info">
-                            <i class="fa-fw fa fa-info"></i>
-                            <strong>Hinweis!</strong>
-                            IP-Adressen sind wegen des Datenschutzes Anonymisiert!
-                        </div>
-                        <table id="dlLists" class="table table-bordered table-hover table-striped table-responsive" width="100%">
-                            <thead>
-                                <th width="5%">ID</th>
-                                <th width="5%">IP Adresse</th>
-                                <th width="25%">UserAgent</th>
-                                <th width="5%">Timestamp</th>
-                                <th width="5%">DL Version</th>
-                            </thead>
-                        </table>
+            <div class="no-padding">
+
+                <div class="widget-body">
+                    <div class="alert alert-info">
+                        <i class="fa-fw fa fa-info"></i>
+                        <strong>Hinweis!</strong>
+                        IP-Adressen sind wegen des Datenschutzes Anonymisiert!
                     </div>
+                    <table id="dlLists" class="table table-bordered table-hover table-striped table-responsive" width="100%">
+                        <thead>
+                        <th width="5%">ID</th>
+                        <th width="5%">IP Adresse</th>
+                        <th width="25%">UserAgent</th>
+                        <th width="5%">Timestamp</th>
+                        <th width="5%">DL Version</th>
+                        </thead>
+                    </table>
                 </div>
             </div>
-        </article>
+        </div>
+    </article>
 {/block}

Application/templates/SmartAdmin/ajax/visitorOverview.tpl

@@ -3,6 +3,8 @@
         <script src="lib/SmartAdmin/js/plugin/datatables/jquery.dataTables.min.js"></script>
         <script src="lib/SmartAdmin/js/plugin/datatables/dataTables.bootstrap.min.js"></script>
         <script src="lib/SmartAdmin/js/ajax/dataTable.js"></script>
+        <script src="lib/SmartAdmin/js/notification/SmartNotification.min.js"></script>
+
         <article class="col-sm-12">
             <!-- new widget -->
             <div class="jarviswidget jarviswidget-color-blueLight" id="wid-id-0" data-widget-togglebutton="false" data-widget-editbutton="false" data-widget-fullscreenbutton="false" data-widget-colorbutton="false" data-widget-deletebutton="false">

Application/templates/SmartAdmin/auth/login.tpl

@@ -88,7 +88,7 @@
                                     <input type="password" name="admin_password">
                                     <b class="tooltip tooltip-top-right"><i class="fa fa-lock txt-color-teal"></i> Bitte dein Kennwort eintragen</b> </label>
                             </section>
-
+                        <p class="text-center small">SMN-Backend-{fetch file="../version"}</p>
                         </fieldset>
                         <footer>
                             <button type="submit" class="btn btn-primary">
@@ -98,7 +98,6 @@
                     </form>
 
                 </div>
-
             </div>
         </div>
     </div>
@@ -114,7 +113,7 @@
 <script> if (!window.jQuery.ui) { document.write('<script src="js/libs/jquery-ui-1.10.3.min.js"><\/script>');} </script>-->
 
 <!-- IMPORTANT: APP CONFIG -->
-<script src="lib/SmartAdmin/js/app.config.seed.js"></script>
+<script src="lib/SmartAdmin/js/app.config.js"></script>
 
 <!-- JS TOUCH : include this plugin for mobile drag / drop touch events
 <script src="js/plugin/jquery-touch/jquery.ui.touch-punch.min.js"></script> -->

Application/templates/SmartAdmin/header.tpl

@@ -61,7 +61,7 @@
 
         <!-- logout button -->
         <div id="logout" class="btn-header transparent pull-right">
-            <span> <a href="/logout" title="Sign Out" data-action="userLogout" data-logout-msg="Willst Du dich wirklich ausloggen?"><i class="fa fa-sign-out"></i></a> </span>
+            <span> <a href="/logout" title="Sign Out" data-action="userLogout" data-logout-msg="Willst Du dich wirklich ausloggen&quest;" id="logout"><i class="fa fa-sign-out"></i></a> </span>
         </div>
         <!-- end logout button -->
     </div>

web/lib/SmartAdmin/js/ajax/dataTable.js

@@ -1,6 +1,7 @@
+$.root_ = $('body');
 $.extend(true, $.fn.dataTable.defaults, {
     bLengthChange: false,
-    pageLength: 15,
+    pageLength: 10,
     "language": {
         "sEmptyTable": "Keine Daten in der Tabelle vorhanden",
         "sInfo": "_START_ bis _END_ von _TOTAL_ Einträgen",

web/lib/SmartAdmin/js/main.js

@@ -14,14 +14,19 @@ $(document).ready(function() {
             });
         });
     });
-
+    $('#logout').click(function(e) {
+       $("#ajaxReq").html();
+    });
     $('#allDls').click(function(e) {
        var loadData = $.ajax({
            method: "GET",
-           url: "ajax/downloadOverview.php"
+           url: "ajax/downloadOverview.php",
+           beforeSend: function () {
+               $('#ajaxReq').html('<h1 class="text-center"><i class="fa fa-refresh fa-spin"></i> Daten werden geladen</h1>')
+           }
        });
 
-       loadData.done(function(data) {
+       loadData.success(function(data) {
            $("#ajaxReq").html(data);
        });
 
@@ -34,7 +39,10 @@ $(document).ready(function() {
     $('#allVisits').click(function(e) {
        var loadData = $.ajax({
            method: "GET",
-           url: "ajax/visitorOverview.php"
+           url: "ajax/visitorOverview.php",
+           beforeSend: function () {
+               $('#ajaxReq').html('<h1 class="text-center"><i class="fa fa-refresh fa-spin"></i> Daten werden geladen</h1>')
+           }
        });
 
        loadData.done(function(data) {