Fixes and CSS improvements

Fixed #103 - MS Tile Color
Fixed #108 - Error in header caused by undefined variables
Fixed #110 - Notifucation Options

css/style.css

@@ -1558,7 +1558,7 @@ body {
 }
 
 .login .login-form {
-  padding: 30px 80px 30px;
+  padding: 15px;
 }
 
 .login form {
@@ -1573,7 +1573,7 @@ body {
 
 /*Registration page*/
 .registration-form {
-  padding: 30px 80px 120px;
+  padding: 15px;
 }
 
 .registration-form h4 {
@@ -5643,7 +5643,8 @@ label {
 }
 
 .help-text {
-  padding: 3px 0;
+  padding: 0;
+  font-size: 10px;
 }
 
 .form-control.material {

images/favicon/browserconfig.xml

@@ -3,7 +3,7 @@
   <msapplication>
     <tile>
       <square150x150logo src="images/favicon/mstile-150x150.png"/>
-      <TileColor>#2d89ef</TileColor>
+      <TileColor>#E49F0C</TileColor>
     </tile>
   </msapplication>
 </browserconfig>

images/favicon/manifest.json

@@ -12,6 +12,6 @@
 			"type": "image\/png"
 		}
 	],
-	"theme_color": "#2d89ef",
+	"theme_color": "#E49F0C",
 	"display": "standalone"
 }

index.php

@@ -232,19 +232,19 @@ else :
 
         foreach($resulto as $row) : 
 
-            $title = $row['title'];
-            $topbartext = $row['topbartext'];
-            $topbar = $row['topbar'];
-            $bottombar = $row['bottombar'];
-            $sidebar = $row['sidebar'];
-            $hoverbg = $row['hoverbg'];
-            $activetabBG = $row['activetabBG'];
-            $activetabicon = $row['activetabicon'];
-            $activetabtext = $row['activetabtext'];
-            $inactiveicon = $row['inactiveicon'];
-            $inactivetext = $row['inactivetext'];
-            $loading = $row['loading'];
-            $hovertext = $row['hovertext'];
+            $title = isset($row['title']) ? $row['title'] : "Organizr";
+            $topbartext = isset($row['topbartext']) ? $row['topbartext'] : "#66D9EF";
+            $topbar = isset($row['topbar']) ? $row['topbar'] : "#333333";
+            $bottombar = isset($row['bottombar']) ? $row['bottombar'] : "#333333";
+            $sidebar = isset($row['sidebar']) ? $row['sidebar'] : "#393939";
+            $hoverbg = isset($row['hoverbg']) ? $row['hoverbg'] : "#AD80FD";
+            $activetabBG = isset($row['activetabBG']) ? $row['activetabBG'] : "#F92671";
+            $activetabicon = isset($row['activetabicon']) ? $row['activetabicon'] : "#FFFFFF";
+            $activetabtext = isset($row['activetabtext']) ? $row['activetabtext'] : "#FFFFFF";
+            $inactiveicon = isset($row['inactiveicon']) ? $row['inactiveicon'] : "#66D9EF";
+            $inactivetext = isset($row['inactivetext']) ? $row['inactivetext'] : "#66D9EF";
+            $loading = isset($row['loading']) ? $row['loading'] : "#66D9EF";
+            $hovertext = isset($row['hovertext']) ? $row['hovertext'] : "#000000";
 
         endforeach;
 
@@ -296,6 +296,8 @@ endif;
         
         <link rel="stylesheet" href="<?=$baseURL;?>bower_components/sweetalert/dist/sweetalert.css">
         <link rel="stylesheet" href="<?=$baseURL;?>bower_components/smoke/dist/css/smoke.min.css">
+        <link rel="stylesheet" href="<?=$baseURL;?>js/notifications/ns-style-growl.css">
+        <link rel="stylesheet" href="<?=$baseURL;?>js/notifications/ns-style-other.css">
 
 
         <script src="<?=$baseURL;?>js/menu/modernizr.custom.js"></script>
@@ -1259,32 +1261,57 @@ endif;
             
         };
             
-        function notify(notifyString, notifyIcon, notifyType, notifyLength) {
+        function notify(notifyString, notifyIcon, notifyType, notifyLength, notifyLayout, notifyEffect) {
             
             var notifyString = notifyString;
             var notifyIcon = notifyIcon;
             var notifyType = notifyType;
             var notifyLength = notifyLength;
+            var notifyLayout = notifyLayout; 
+            var notifyEffect = notifyEffect;
+            
+            if (notifyEffect === "slidetop"){
+                
+                var addMeesage = '<span class="fa fa-' + notifyIcon + ' fa-2x"></span>' + '<p>' + notifyString + '</p>';
+                
+            }else if (notifyEffect === "exploader"){
+                
+                var addMeesage = '<span class="fa fa-' + notifyIcon + ' fa-2x pull-left"></span>' + '<p>' + notifyString + '</p>';
+            
+            }else if (notifyEffect === "thumbslider"){
+                
+                var addMeesage = '<div class="ns-thumb"><img src="images/alert.png"/></div><div class="ns-content"><p>' + notifyString + '</p></div>';    
+                
+            }else{
+                
+                var addMeesage = '<p>' + notifyString + '</p>';
+            
+            }
 
             setTimeout(function () {
 
                 var notification = new NotificationFx({
+                    
+                    message: addMeesage,
 
-                    message: '<span class="fa fa-' + notifyIcon + ' fa-2x"></span><p>' + notifyString + '</p>',
-
-                    layout: 'bar',
+                    layout: notifyLayout,
 
-                    effect: 'slidetop',
+                    effect: notifyEffect,
                     
                     ttl: notifyLength,
 
-                    type: notifyType // notice, warning, success or error
+                    type: notifyType,
+                    
+                    onClose: function () {
+                        
+                        $(".ns-box.ns-effect-thumbslider").fadeOut(400);
+                    }
 
                 });
 
                 notification.show();
 
-            }, 300);
+            }, 500);
 
         }
             
@@ -1481,53 +1508,18 @@ endif;
 
         }); 
             
-        $(function () {
-
-            <?php if(!empty($USER->info_log)) : ?>
-            
-            setTimeout(function () {
-
-                var notification = new NotificationFx({
-
-                    message: '<span class="fa fa-info-circle fa-2x"></span><p><?php echo printArray($USER->info_log);?></p>',
-
-                    layout: 'bar',
-
-                    effect: 'slidetop',
-
-                    type: 'notice', // notice, warning, success or error
-
-                });
-
-                notification.show();
-
-            }, 1200);
-
-            <?php endif; ?>
-            
-            <?php if(!empty($USER->error_log)) : ?>
+        <?php if(!empty($USER->info_log)) : ?>
 
-            setTimeout(function () {
-
-                var notification = new NotificationFx({
-
-                    message: '<span class="fa fa-exclamation-triangle fa-2x"></span><p><?php echo printArray($USER->error_log); ?></p>',
-
-                    layout: 'bar',
+        notify("<?php echo printArray($USER->info_log); ?>","info-circle","notice","5000", "<?=$notifyExplode[0];?>", "<?=$notifyExplode[1];?>");
 
-                    effect: 'slidetop',
+        <?php endif; ?>
 
-                    type: 'warning', // notice, warning, success or error
+        <?php if(!empty($USER->error_log)) : ?>
 
-                });
+        notify("<?php echo printArray($USER->error_log); ?>","exclamation-circle ","error","5000", "<?=$notifyExplode[0];?>", "<?=$notifyExplode[1];?>");
 
-                notification.show();
+        <?php endif; ?>
 
-            }, 1200);
-            
-            <?php endif; ?>
-
-        });
             
         $('#reload').on('click tap', function(){
 

lang/de.ini

@@ -149,8 +149,9 @@ TRANSLATIONS_ABOUT = "Wir benötigen immer Hilfe bei der Übersetzung. Sollten S
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Hintergrund Ladebildschirm"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Cookie Password"
 CREATE_USER = "Create Account"
 ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
 SUBMIT = "Submit"
-REGISTER_PASSWORD = "Registration Password"
+REGISTER_PASSWORD = "Registration Password"
+NOTIFICATION_TYPE = "Notification Style"

lang/en.ini

@@ -149,8 +149,9 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Cookie Password"
 CREATE_USER = "Create Account"
 ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
 SUBMIT = "Submit"
-REGISTER_PASSWORD = "Registration Password"
+REGISTER_PASSWORD = "Registration Password"
+NOTIFICATION_TYPE = "Notification Style"

lang/es.ini

@@ -149,8 +149,9 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Cookie Password"
 CREATE_USER = "Create Account"
 ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
 SUBMIT = "Submit"
-REGISTER_PASSWORD = "Registration Password"
+REGISTER_PASSWORD = "Registration Password"
+NOTIFICATION_TYPE = "Notification Style"

lang/fr.ini

@@ -149,8 +149,9 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Cookie Password"
 CREATE_USER = "Create Account"
 ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
 SUBMIT = "Submit"
-REGISTER_PASSWORD = "Registration Password"
+REGISTER_PASSWORD = "Registration Password"
+NOTIFICATION_TYPE = "Notification Style"

lang/it.ini

@@ -149,8 +149,9 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Cookie Password"
 CREATE_USER = "Create Account"
 ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
 SUBMIT = "Submit"
-REGISTER_PASSWORD = "Registration Password"
+REGISTER_PASSWORD = "Registration Password"
+NOTIFICATION_TYPE = "Notification Style"

lang/nl.ini

@@ -149,8 +149,9 @@ TRANSLATIONS_ABOUT = "We always need help with translations.  If you speak anoth
 UPGRADE = "Upgrade"
 LOADING_COLOR = "Loading Background"
 HOVER_TEXT = "Hover Text"
-COOKIE_PASSWORD = "Enter Cookie Password"
+COOKIE_PASSWORD = "Cookie Password"
 CREATE_USER = "Create Account"
 ENTER_PASSWORD_TO_REGISTER = "Enter Password To Register"
 SUBMIT = "Submit"
-REGISTER_PASSWORD = "Registration Password"
+REGISTER_PASSWORD = "Registration Password"
+NOTIFICATION_TYPE = "Notification Style"

user.php

@@ -16,6 +16,8 @@
     if(!empty($databaseConfig['multipleLogin'])) : define('MULTIPLELOGIN', $databaseConfig['multipleLogin']); else : define('MULTIPLELOGIN', 'false'); endif;
     if(!empty($databaseConfig['cookiePassword'])) : define('COOKIEPASSWORD', $databaseConfig['cookiePassword']); else : define('COOKIEPASSWORD', ''); endif;
     if(!empty($databaseConfig['registerPassword'])) : define('REGISTERPASSWORD', $databaseConfig['registerPassword']); else : define('REGISTERPASSWORD', ''); endif;
+    if(!empty($databaseConfig['notifyEffect'])) : define('NOTIFYEFFECT', $databaseConfig['notifyEffect']); else : define('NOTIFYEFFECT', 'bar-slidetop'); endif;
+    $notifyExplode = explode("-", NOTIFYEFFECT);
     define('FAIL_LOG', 'loginLog.json');
     date_default_timezone_set(TIMEZONE);