Merge pull request #127 from causefx/develop

Small CSS Changes and Tiny Fixes

css/style.css

@@ -2406,12 +2406,12 @@ table.dataTable.no-footer, table.dataTable thead th, table.dataTable thead td {
 }
 
 .todo .list-group-item {
-  border-bottom: 0;
+  /*border-bottom: 0;
   border-top: 0;
   border-right: 0;
   -webkit-border-radius: 4px;
           border-radius: 4px;
-  margin-bottom: 3px;
+  margin-bottom: 3px;*/
   background: #F3F3F3;
 }
 
@@ -2513,7 +2513,7 @@ a.thumbnail.active, a.thumbnail:focus, a.thumbnail:hover {
 }
 
 .input-group-addon {
-  border-color: #E7EBEC;
+  border: solid 1px #C0C0C0 !important;
 }
 
 .form-inline .form-group {
@@ -2977,7 +2977,7 @@ ul.inbox-pagination li {
 }
 
 .list-group-item {
-  border-color: #E7EBEC;
+  border-color: #C0C0C0;
 }
 
 .email-container .email-view, .email-container .email-compose {

images/favicon/manifest.json

@@ -2,12 +2,12 @@
 	"name": "Organizr",
 	"icons": [
 		{
-			"src": "images\/favicon\/android-chrome-192x192.png",
+			"src": "android-chrome-192x192.png",
 			"sizes": "192x192",
 			"type": "image\/png"
 		},
 		{
-			"src": "images\/favicon\/android-chrome-512x512.png",
+			"src": "android-chrome-512x512.png",
 			"sizes": "512x512",
 			"type": "image\/png"
 		}

index.php

@@ -144,6 +144,7 @@ if(!file_exists($databaseLocation)) :
 
     $configReady = "No";
     $userpic = "";
+    $showPic = "";
 
 else :
 
@@ -1934,6 +1935,14 @@ if(SLIMBAR == "true") : $slimBar = "30"; $userSize = "25"; else : $slimBar = "56
             $("#contentRight").html('');
         
         });    
+        
+        var ref = document.referrer;
+        if(ref.indexOf("updated")>=0){
+
+            notify("<?php echo $language->translate('UPDATE_COMPLETE');?>","exclamation-circle ","success","5000", "<?=$notifyExplode[0];?>", "<?=$notifyExplode[1];?>");
+
+        }    
+            
         </script>
 
     </body>

lang/de.ini

@@ -160,3 +160,7 @@ ENABLE_MAIL = "Mail aktivieren"
 PROMOTE = "Hochstufen"
 DEMOTE = "Zurückstufen"
 ENABLE_SLIMBAR = "Schmale Titelleiste aktivieren"
+UPDATE_COMPLETE = "Organizer Version & Database Have Been Upgraded!"
+ICON_COPY = "Icon Path Copied To Clipboard"
+TEST_MESSAGE = "This is a test message"
+TEST = "Test"

lang/en.ini

@@ -159,4 +159,8 @@ ENABLE_LOADING_SCREEN = "Loading Screen"
 ENABLE_MAIL = "Enable Mail"
 PROMOTE = "Promote"
 DEMOTE = "Demote"
-ENABLE_SLIMBAR = "Enable Slim Bar"
+ENABLE_SLIMBAR = "Enable Slim Bar"
+UPDATE_COMPLETE = "Organizer Version & Database Have Been Upgraded!"
+ICON_COPY = "Icon Path Copied To Clipboard"
+TEST_MESSAGE = "This is a test message"
+TEST = "Test"

lang/es.ini

@@ -159,4 +159,8 @@ ENABLE_LOADING_SCREEN = "Loading Screen"
 ENABLE_MAIL = "Enable Mail"
 PROMOTE = "Promote"
 DEMOTE = "Demote"
-ENABLE_SLIMBAR = "Enable Slim Bar"
+ENABLE_SLIMBAR = "Enable Slim Bar"
+UPDATE_COMPLETE = "Organizer Version & Database Have Been Upgraded!"
+ICON_COPY = "Icon Path Copied To Clipboard"
+TEST_MESSAGE = "This is a test message"
+TEST = "Test"

lang/fr.ini

@@ -159,4 +159,8 @@ ENABLE_LOADING_SCREEN = "Loading Screen"
 ENABLE_MAIL = "Enable Mail"
 PROMOTE = "Promote"
 DEMOTE = "Demote"
-ENABLE_SLIMBAR = "Enable Slim Bar"
+ENABLE_SLIMBAR = "Enable Slim Bar"
+UPDATE_COMPLETE = "Organizer Version & Database Have Been Upgraded!"
+ICON_COPY = "Icon Path Copied To Clipboard"
+TEST_MESSAGE = "This is a test message"
+TEST = "Test"

lang/it.ini

@@ -159,4 +159,8 @@ ENABLE_LOADING_SCREEN = "Loading Screen"
 ENABLE_MAIL = "Enable Mail"
 PROMOTE = "Promote"
 DEMOTE = "Demote"
-ENABLE_SLIMBAR = "Enable Slim Bar"
+ENABLE_SLIMBAR = "Enable Slim Bar"
+UPDATE_COMPLETE = "Organizer Version & Database Have Been Upgraded!"
+ICON_COPY = "Icon Path Copied To Clipboard"
+TEST_MESSAGE = "This is a test message"
+TEST = "Test"

lang/nl.ini

@@ -159,4 +159,8 @@ ENABLE_LOADING_SCREEN = "Loading Screen"
 ENABLE_MAIL = "Enable Mail"
 PROMOTE = "Promote"
 DEMOTE = "Demote"
-ENABLE_SLIMBAR = "Enable Slim Bar"
+ENABLE_SLIMBAR = "Enable Slim Bar"
+UPDATE_COMPLETE = "Organizer Version & Database Have Been Upgraded!"
+ICON_COPY = "Icon Path Copied To Clipboard"
+TEST_MESSAGE = "This is a test message"
+TEST = "Test"

translate.php

@@ -41,8 +41,7 @@ class setLanguage {
             echo ("Translation not found for: $originalWord"); 
         
         endif; 
-        
-        //$translatedWord = str_replace( array( "'","'" ),'', $translatedWord );
+
         $translatedWord = htmlspecialchars($translatedWord, ENT_QUOTES);
         
         return vsprintf($translatedWord, $allWords);
@@ -51,7 +50,7 @@ class setLanguage {
     
 } 
 
-$getLanguage = substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2); 
+$getLanguage = isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? substr($_SERVER['HTTP_ACCEPT_LANGUAGE'], 0, 2) : "en"; 
 $language = new setLanguage($getLanguage);
 
 ?>

updatedb.php

@@ -118,7 +118,7 @@ function checkDatabase($type, $table, $check) {
         
             (function countdown(remaining) {
                 if(remaining === 0)
-                    location.reload(true);
+                    window.top.location = window.top.location.href.split('#')[0];
                 document.getElementById('countdown').innerHTML = "<center>Page will refresh in <strong>" + remaining + "</strong> seconds [You may close this at anytime]</center>";
                 setTimeout(function(){ countdown(remaining - 1); }, 1000);
             })(10);