diff --git a/css/style.css b/css/style.css index 544315ace..c7a25865e 100644 --- a/css/style.css +++ b/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 { diff --git a/images/favicon/manifest.json b/images/favicon/manifest.json index f43cdea3e..860ddbf83 100644 --- 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 new file mode 100644 index 000000000..c5cd79ced Binary files /dev/null and b/images/themes/darkly.png differ diff --git a/images/themes/emby.png b/images/themes/emby.png new file mode 100644 index 000000000..4cc3ea149 Binary files /dev/null and b/images/themes/emby.png differ diff --git a/images/themes/facebook.png b/images/themes/facebook.png new file mode 100644 index 000000000..49bef1d04 Binary files /dev/null and b/images/themes/facebook.png differ diff --git a/images/themes/joker.png b/images/themes/joker.png new file mode 100644 index 000000000..26c2949b1 Binary files /dev/null and b/images/themes/joker.png differ diff --git a/images/themes/monokai.png b/images/themes/monokai.png new file mode 100644 index 000000000..f0821e983 Binary files /dev/null and b/images/themes/monokai.png differ diff --git a/images/themes/original.png b/images/themes/original.png new file mode 100644 index 000000000..09adbbf46 Binary files /dev/null and b/images/themes/original.png differ diff --git a/images/themes/plex.png b/images/themes/plex.png new file mode 100644 index 000000000..4b7613a71 Binary files /dev/null and b/images/themes/plex.png differ diff --git a/images/themes/slate.png b/images/themes/slate.png new file mode 100644 index 000000000..4a1a35e2f Binary files /dev/null and b/images/themes/slate.png differ diff --git a/images/themes/spa.png b/images/themes/spa.png new file mode 100644 index 000000000..8381cd6b5 Binary files /dev/null and b/images/themes/spa.png differ diff --git a/index.php b/index.php index ae9a31ff6..b5d5a4d62 100644 --- 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("translate('UPDATE_COMPLETE');?>","exclamation-circle ","success","5000", "", ""); + + } + diff --git a/lang/de.ini b/lang/de.ini index ecd56deb5..b818e676e 100644 --- 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" \ No newline at end of file diff --git a/lang/en.ini b/lang/en.ini index 070164887..7bacd2d4c 100644 --- 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" \ No newline at end of file +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" \ No newline at end of file diff --git a/lang/es.ini b/lang/es.ini index 44796104f..3376bd675 100644 --- 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" \ No newline at end of file +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" \ No newline at end of file diff --git a/lang/fr.ini b/lang/fr.ini index c258f635e..e017fdc86 100644 --- 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" \ No newline at end of file +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" \ No newline at end of file diff --git a/lang/it.ini b/lang/it.ini index f35e7253f..54901b979 100644 --- 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" \ No newline at end of file +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" \ No newline at end of file diff --git a/lang/nl.ini b/lang/nl.ini index 282eae2b5..32f71b957 100644 --- 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" \ No newline at end of file +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" \ No newline at end of file diff --git a/settings.php b/settings.php index 85c033522..fb2f89b33 100644 --- a/settings.php +++ b/settings.php @@ -665,7 +665,17 @@ function rcopy($src, $dst) { }.key.wide span { width:auto; padding:0 12px; - } + }.todo .action-btns a span { + color: #76828e !important; + }.todo li:nth-child(even) { + background: #FFFFFF !important; + }.themeImage { + position: fixed; + left: 160px; + top: 0px; + height: 400px; + }.chooseTheme a span { position:absolute; display:none; z-index:99; } + .chooseTheme a:hover span { display:block; } @@ -724,7 +734,7 @@ function rcopy($src, $dst) { - + + + @@ -1230,7 +1246,7 @@ function rcopy($src, $dst) { - +

translate("NOTIFICATION_TYPE");?>

@@ -1741,27 +1757,23 @@ function getColor($colorTest){ @@ -2019,7 +2031,7 @@ function getColor($colorTest){ }else{ - parent.notify("Tabs Saved! Apply Changes To Reload The Page!","floppy-o","success","5000", "", ""); + parent.notify("translate('TABS_SAVED');?> translate('APPLY_RELOAD');?>","floppy-o","success","5000", "", ""); } @@ -2029,7 +2041,7 @@ function getColor($colorTest){ @@ -2088,8 +2100,9 @@ function stopTrigger() { //$(".todo ul").sortable(); $(".todo ul").sortable({ - 'containment': 'parent', - 'opacity': 0.9 + + 'opacity': 0.9, + }); $("#add_tab").on('submit', function (e) { @@ -2103,7 +2116,7 @@ function stopTrigger() { var newid = $('.list-group-item').length + 1; $(".todo ul").append( - '
  • " value="' + toDo_name + '">
    ">
    - translate("OR");?> -
    " value="">
    translate("ACTIVE");?>
    translate("USER");?>
    translate("GUEST");?>
    translate("NO_IFRAME");?>
    • ' + '
  • " value="' + toDo_name + '">
    ">
    - translate("OR");?> -
    " value="">
    translate("ACTIVE");?>
    translate("USER");?>
    translate("GUEST");?>
    translate("NO_IFRAME");?>
    • ' ); $('.icp-auto').iconpicker({placement: 'left', hideOnSelect: false, collision: true}); @@ -2228,7 +2241,7 @@ function set(key, value){ var notifySplit = $("#notifyValue").val().split("-"); console.log(notifySplit[0]); - parent.notify("This is a test message","flask","notice","5000", notifySplit[0], notifySplit[1]); + parent.notify("translate('TEST_MESSAGE');?>","flask","notice","5000", notifySplit[0], notifySplit[1]); }); @@ -2343,7 +2356,7 @@ function copyToClipboard(elem) { copyToClipboard(document.getElementById("copyTarget")); - parent.notify("Icon Path Copied To Clipboard","clipboard","success","5000", "", ""); + parent.notify("translate('ICON_COPY');?>","clipboard","success","5000", "", ""); $( "div[id^='viewAllIcons']" ).toggle(); @@ -2555,7 +2568,7 @@ function changeColor(elementName, elementColor) { dataType: "json", success: function(github) { - var currentVersion = "0.99996"; + var currentVersion = "0.99997"; infoTabVersion = $('#about').find('#version'); infoTabVersionHistory = $('#about').find('#versionHistory'); @@ -2572,7 +2585,7 @@ function changeColor(elementName, elementColor) { } - $(infoTabVersionHistory).append('

  • ' + v.name + '

    ' + v.body + '

    • '); + $(infoTabVersionHistory).append('

  • ' + v.name + '

    ' + v.body + '

    • '); }); diff --git a/translate.php b/translate.php index 71c613a58..4296a54c9 100644 --- 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); ?> \ No newline at end of file diff --git a/updatedb.php b/updatedb.php index 68391d23c..8bda68d01 100644 --- 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 = "
    Page will refresh in " + remaining + " seconds [You may close this at anytime]
    "; setTimeout(function(){ countdown(remaining - 1); }, 1000); })(10);