Welcome UI

Version Update
pHAlkaline · May 3, 2022 · 04767a1 · 04767a1
1 parent fa7f154
commit 04767a1
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 43 deletions.
diff --git a/VERSION.txt b/VERSION.txt
@@ -18,4 +18,4 @@
 // @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-1.7.1
+1.7.2
diff --git a/app/Config/core.php b/app/Config/core.php
@@ -229,12 +229,12 @@
 /**
  * A random string used in security hashing methods.
  */
-Configure::write('Security.salt', '7e7e6cd1c9a17a67acbb02870a23c87b8fd1829a');
+Configure::write('Security.salt', '1b9db5be4b868be34371e782e14ba219c682ea66');
 
 /**
  * A random numeric string (digits only) used to encrypt/decrypt strings.
  */
-Configure::write('Security.cipherSeed', '19135413161694743485');
+Configure::write('Security.cipherSeed', '1060745774376864617');
 
 /**
  * Apply timestamps with the last modified time to static assets (js, css, images).

diff --git a/app/View/Themed/Phkapa/Layouts/admin.ctp b/app/View/Themed/Phkapa/Layouts/admin.ctp
@@ -67,8 +67,29 @@ $this->Number->defaultCurrency(Configure::read('currency'));
     </body>
         <?php
             echo $this->Html->script(array('jquery-1.8.0.min.js', 'jquery-ui-1.8.23.custom.min.js', 'jquery-cookie.js', 'spin.js'));
+            echo $this->Html->script('loadingoverlay');
             echo $this->fetch('script');
             ?>
+    <script>
+        $(window).on('beforeunload', function ()
+        {
+            overlay();
+        });
+        $(window).on('beforeload', function () {
+            overlay();
+        });
+        function overlay() {
+            $.LoadingOverlaySetup({
+                imageColor: "#00aeef"
+            });
+            $.LoadingOverlay("show");
+            // Hide it after 3 seconds
+            setTimeout(function () {
+                $.LoadingOverlay("hide");
+                $(".body").fadeIn(1500).trigger('bodyVisible');
+            }, 500);
+        }
+    </script>
     <script type="text/javascript">
         $(document).ready(function () {
 

diff --git a/app/View/Themed/Phkapa/Layouts/default.ctp b/app/View/Themed/Phkapa/Layouts/default.ctp
@@ -17,6 +17,7 @@ $this->Number->defaultCurrency(Configure::read('currency'));
         echo '<!--[if IE 7]>' . $this->Html->css('ie') . '<![endif]-->';
         ?>
         <link href='https://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,700,600,800,900' rel='stylesheet' type='text/css'>
+
     </head>
     <body>
 
@@ -76,8 +77,29 @@ $this->Number->defaultCurrency(Configure::read('currency'));
     </body>
         <?php
             echo $this->Html->script(array('jquery-1.8.0.min.js', 'jquery-ui-1.8.23.custom.min.js', 'jquery-cookie.js', 'spin.js'));
+            echo $this->Html->script('loadingoverlay');
             echo $this->fetch('script');
             ?>
+    <script>
+        $(window).on('beforeunload', function ()
+        {
+            overlay();
+        });
+        $(window).on('beforeload', function () {
+            overlay();
+        });
+        function overlay() {
+            $.LoadingOverlaySetup({
+                imageColor: "#00aeef"
+            });
+            $.LoadingOverlay("show");
+            // Hide it after 3 seconds
+            setTimeout(function () {
+                $.LoadingOverlay("hide");
+                $(".body").fadeIn(1500).trigger('bodyVisible');
+            }, 500);
+        }
+    </script>
     <script type="text/javascript">
         $(document).ready(function () {
 

diff --git a/app/View/Themed/Phkapa/Layouts/install.ctp b/app/View/Themed/Phkapa/Layouts/install.ctp
@@ -43,8 +43,23 @@ $this->Number->defaultCurrency(Configure::read('currency'));
     </body>
        <?php
             echo $this->Html->script(array('jquery-1.8.0.min.js', 'jquery-ui-1.8.23.custom.min.js', 'jquery-cookie.js', 'spin.js'));
+             echo $this->Html->script('loadingoverlay');
             echo $this->fetch('script');
             ?>
+    <script>
+        $(window).on('beforeunload', function (){
+            overlay();
+        });
+
+        function overlay() {
+            $.LoadingOverlaySetup({
+                imageColor: "#00aeef"
+            });
+            $.LoadingOverlay("show");
+
+
+        }
+    </script>
     <script type="text/javascript">
         $(document).ready(function () {
             //$('#phkapa').fadeIn(2000);

diff --git a/app/View/Themed/Phkapa/Layouts/welcome.ctp b/app/View/Themed/Phkapa/Layouts/welcome.ctp
@@ -1,4 +1,5 @@
 <?php
+
 $this->Number->defaultCurrency(Configure::read('currency'));
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -17,59 +18,71 @@ $this->Number->defaultCurrency(Configure::read('currency'));
         ?>
         <link href='https://fonts.googleapis.com/css?family=Raleway:400,100,200,300,500,700,600,800,900' rel='stylesheet' type='text/css'>
             <style>
-               .centered {
-  position: fixed;
-  top: 50%;
-  left: 50%;
-  /* bring your own prefixes */
-  transform: translate(-50%, -50%);
-}
+                .centered {
+                    position: fixed;
+                    top: 50%;
+                    left: 50%;
+                    /* bring your own prefixes */
+                    transform: translate(-50%, -50%);
+                }
             </style>
     </head>
     <body>
-
-        <div class="container_16" id="mainContainer">
-         <div class="clear"></div>
+        <body>
+            <div class="container_16" id="mainContainer">
+                <div class="clear"></div>
             <?php echo $this->fetch('content'); ?>
-        </div>
-            <?php // echo $this->element('sql_dump'); ?>
-    </body>
+            </div>
+            <div style="position:fixed;bottom:0;left:50%;transform: translate(-50%, -50%);">
+             <?php echo $this->Flash->render(); ?>
+            </div>
+        </body>
+
         <?php
             echo $this->Html->script(array('jquery-1.8.0.min.js', 'jquery-ui-1.8.23.custom.min.js', 'jquery-cookie.js', 'spin.js'));
             echo $this->fetch('script');
             ?>
-    <script type="text/javascript">
-        $(document).ready(function () {
+        <script type="text/javascript">
+            $(document).ready(function () {
 
-            $('#mainContainer').fadeIn(2000);
-            if (!$.cookie('appMaintenance')) {
-                $('#maintenanceMessage').fadeIn(2000);
-            }
-            $('#maintenanceMessage').click(function () {
-                $.cookie('appMaintenance', 'foo');
-                $('#maintenanceMessage').fadeOut(2000);
-            })
-            $('.flash-message').click(function () {
-                $(this).fadeOut(500);
-            })
+                $('#mainContainer').fadeIn(2000);
+                if (!$.cookie('appMaintenance')) {
+                    $('#maintenanceMessage').fadeIn(2000);
+                }
+                $('#maintenanceMessage').click(function () {
+                    $.cookie('appMaintenance', 'foo');
+                    $('#maintenanceMessage').fadeOut(2000);
+                })
+                $('.flash-message').click(function () {
+                    $(this).fadeOut(500);
+                })
 
-            $("input:submit").button();
-            $("#actions").accordion({
-                collapsible: true,
-                active: false
-            });
-            $("#tabs").tabs();
+                $("input:submit").button();
+                $("#actions").accordion({
+                    collapsible: true,
+                    active: false
+                });
+                $("#tabs").tabs();
 
-            function blinkNotification() {
-                $('.notification').delay(200).fadeTo(200, 0.5).delay(100).fadeTo(100, 1, blinkNotification);
-            }
+                function blinkNotification() {
+                    $('.notification').delay(200).fadeTo(200, 0.5).delay(100).fadeTo(100, 1, blinkNotification);
+                }
 
 
-            <?php if (isset($unread_notifications) && $unread_notifications) { ?>
+                <?php if (isset($unread_notifications) && $unread_notifications) { ?>
                 blinkNotification();
-            <?php } ?>
+                <?php } ?>
 
-        });
+            });
+
+        </script>
+        <script type="text/javascript">
+            $(document).ready(function () {
+                const myClickAnchor = setTimeout(clickAnchor, 3000);
 
-    </script>
+                function clickAnchor() {
+                    $('#go-pHKapa')[0].click();
+                }
+            });
+        </script>
 </html>
diff --git a/app/View/Themed/Phkapa/Pages/welcome.ctp b/app/View/Themed/Phkapa/Pages/welcome.ctp
@@ -6,7 +6,7 @@ $url= AuthComponent::user('id') ? array('admin' => null, 'plugin' => 'phkapa', '
 <div class="grid_16 actionsContainer">
        <div class="grid_16 centered" style="text-align:center" id="pHKapaHome">
             <div>
-                <?php echo $this->Html->link($this->Html->image('pHKapalogo2.png', array('alt' => 'pHKapa')), Router::url($url, true), array('style' => '', 'class' => 'zoom logo2', 'target' => '_self', 'escape' => false)); ?>
+                <?php echo $this->Html->link($this->Html->image('pHKapalogo2.png', array('alt' => 'pHKapa')), Router::url($url, true), array('id'=>'go-pHKapa','style' => '', 'class' => 'zoom logo2', 'target' => '_self', 'escape' => false)); ?>
             </div>
         </div>
     <div class="clear"></div>