Merge pull request #127 from causefx/develop

Small CSS Changes and Tiny Fixes
causefx · Mar 7, 2017 · 891337b · 891337b
2 parents 54855e8 + f9ca6ba
commit 891337b
Show file tree

Hide file tree

Showing 21 changed files with 91 additions and 46 deletions.
diff --git a/css/style.css b/css/style.css
diff --git a/images/favicon/manifest.json b/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"
 		}

diff --git a/images/themes/darkly.png b/images/themes/darkly.png
diff --git a/images/themes/emby.png b/images/themes/emby.png
diff --git a/images/themes/facebook.png b/images/themes/facebook.png
diff --git a/images/themes/joker.png b/images/themes/joker.png
diff --git a/images/themes/monokai.png b/images/themes/monokai.png
diff --git a/images/themes/original.png b/images/themes/original.png
diff --git a/images/themes/plex.png b/images/themes/plex.png
diff --git a/images/themes/slate.png b/images/themes/slate.png
diff --git a/images/themes/spa.png b/images/themes/spa.png
diff --git a/index.php b/index.php
@@ -144,6 +144,7 @@ function getTimezone(){
 
     $configReady = "No";
     $userpic = "";
+    $showPic = "";
 
 else :
 
@@ -1934,6 +1935,14 @@ function notify(notifyString, notifyIcon, notifyType, notifyLength, notifyLayout
             $("#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>

diff --git a/lang/de.ini b/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"
diff --git a/lang/en.ini b/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"
diff --git a/lang/es.ini b/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"
diff --git a/lang/fr.ini b/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"
diff --git a/lang/it.ini b/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"
diff --git a/lang/nl.ini b/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"
diff --git a/settings.php b/settings.php
diff --git a/translate.php b/translate.php
@@ -41,8 +41,7 @@ public function translate($originalWord) {
             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 @@ public function translate($originalWord) {
 
 } 
 
-$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);
 
 ?>
diff --git a/updatedb.php b/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);