Sfoglia il codice sorgente

Minor Fixes and changes

Fixed #155  - Option to disable Gravatar - Also got rid of outside
elements being loaded such as google fonts.
Fixed - Sidebar hamburger menu transformation
Fixed Custom Error Page url path
Fixed iFrame issue where sometimes when you click a button it would move
up 3 pixels.
Moved Installed Version variable to user.php file
Added default pin on on first setup
Updated language strings
Changed Version History icon to Github
causefx 9 anni fa
parent
commit
cbd95dd3aa

+ 320 - 9
bower_components/font-awesome/css/font-awesome.css

@@ -1,13 +1,13 @@
 /*!
- *  Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.7.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 /* FONT PATH
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../fonts/fontawesome-webfont.eot?v=4.4.0');
-  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg');
+  src: url('../fonts/fontawesome-webfont.eot?v=4.7.0');
+  src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.7.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.7.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.7.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -118,31 +118,31 @@
   }
 }
 .fa-rotate-90 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";
   -webkit-transform: rotate(90deg);
   -ms-transform: rotate(90deg);
   transform: rotate(90deg);
 }
 .fa-rotate-180 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";
   -webkit-transform: rotate(180deg);
   -ms-transform: rotate(180deg);
   transform: rotate(180deg);
 }
 .fa-rotate-270 {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";
   -webkit-transform: rotate(270deg);
   -ms-transform: rotate(270deg);
   transform: rotate(270deg);
 }
 .fa-flip-horizontal {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";
   -webkit-transform: scale(-1, 1);
   -ms-transform: scale(-1, 1);
   transform: scale(-1, 1);
 }
 .fa-flip-vertical {
-  filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);
+  -ms-filter: "progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)";
   -webkit-transform: scale(1, -1);
   -ms-transform: scale(1, -1);
   transform: scale(1, -1);
@@ -1383,7 +1383,7 @@
 .fa-digg:before {
   content: "\f1a6";
 }
-.fa-pied-piper:before {
+.fa-pied-piper-pp:before {
   content: "\f1a7";
 }
 .fa-pied-piper-alt:before {
@@ -1509,6 +1509,7 @@
   content: "\f1ce";
 }
 .fa-ra:before,
+.fa-resistance:before,
 .fa-rebel:before {
   content: "\f1d0";
 }
@@ -1831,6 +1832,7 @@
   content: "\f23e";
 }
 .fa-battery-4:before,
+.fa-battery:before,
 .fa-battery-full:before {
   content: "\f240";
 }
@@ -2024,3 +2026,312 @@
 .fa-fonticons:before {
   content: "\f280";
 }
+.fa-reddit-alien:before {
+  content: "\f281";
+}
+.fa-edge:before {
+  content: "\f282";
+}
+.fa-credit-card-alt:before {
+  content: "\f283";
+}
+.fa-codiepie:before {
+  content: "\f284";
+}
+.fa-modx:before {
+  content: "\f285";
+}
+.fa-fort-awesome:before {
+  content: "\f286";
+}
+.fa-usb:before {
+  content: "\f287";
+}
+.fa-product-hunt:before {
+  content: "\f288";
+}
+.fa-mixcloud:before {
+  content: "\f289";
+}
+.fa-scribd:before {
+  content: "\f28a";
+}
+.fa-pause-circle:before {
+  content: "\f28b";
+}
+.fa-pause-circle-o:before {
+  content: "\f28c";
+}
+.fa-stop-circle:before {
+  content: "\f28d";
+}
+.fa-stop-circle-o:before {
+  content: "\f28e";
+}
+.fa-shopping-bag:before {
+  content: "\f290";
+}
+.fa-shopping-basket:before {
+  content: "\f291";
+}
+.fa-hashtag:before {
+  content: "\f292";
+}
+.fa-bluetooth:before {
+  content: "\f293";
+}
+.fa-bluetooth-b:before {
+  content: "\f294";
+}
+.fa-percent:before {
+  content: "\f295";
+}
+.fa-gitlab:before {
+  content: "\f296";
+}
+.fa-wpbeginner:before {
+  content: "\f297";
+}
+.fa-wpforms:before {
+  content: "\f298";
+}
+.fa-envira:before {
+  content: "\f299";
+}
+.fa-universal-access:before {
+  content: "\f29a";
+}
+.fa-wheelchair-alt:before {
+  content: "\f29b";
+}
+.fa-question-circle-o:before {
+  content: "\f29c";
+}
+.fa-blind:before {
+  content: "\f29d";
+}
+.fa-audio-description:before {
+  content: "\f29e";
+}
+.fa-volume-control-phone:before {
+  content: "\f2a0";
+}
+.fa-braille:before {
+  content: "\f2a1";
+}
+.fa-assistive-listening-systems:before {
+  content: "\f2a2";
+}
+.fa-asl-interpreting:before,
+.fa-american-sign-language-interpreting:before {
+  content: "\f2a3";
+}
+.fa-deafness:before,
+.fa-hard-of-hearing:before,
+.fa-deaf:before {
+  content: "\f2a4";
+}
+.fa-glide:before {
+  content: "\f2a5";
+}
+.fa-glide-g:before {
+  content: "\f2a6";
+}
+.fa-signing:before,
+.fa-sign-language:before {
+  content: "\f2a7";
+}
+.fa-low-vision:before {
+  content: "\f2a8";
+}
+.fa-viadeo:before {
+  content: "\f2a9";
+}
+.fa-viadeo-square:before {
+  content: "\f2aa";
+}
+.fa-snapchat:before {
+  content: "\f2ab";
+}
+.fa-snapchat-ghost:before {
+  content: "\f2ac";
+}
+.fa-snapchat-square:before {
+  content: "\f2ad";
+}
+.fa-pied-piper:before {
+  content: "\f2ae";
+}
+.fa-first-order:before {
+  content: "\f2b0";
+}
+.fa-yoast:before {
+  content: "\f2b1";
+}
+.fa-themeisle:before {
+  content: "\f2b2";
+}
+.fa-google-plus-circle:before,
+.fa-google-plus-official:before {
+  content: "\f2b3";
+}
+.fa-fa:before,
+.fa-font-awesome:before {
+  content: "\f2b4";
+}
+.fa-handshake-o:before {
+  content: "\f2b5";
+}
+.fa-envelope-open:before {
+  content: "\f2b6";
+}
+.fa-envelope-open-o:before {
+  content: "\f2b7";
+}
+.fa-linode:before {
+  content: "\f2b8";
+}
+.fa-address-book:before {
+  content: "\f2b9";
+}
+.fa-address-book-o:before {
+  content: "\f2ba";
+}
+.fa-vcard:before,
+.fa-address-card:before {
+  content: "\f2bb";
+}
+.fa-vcard-o:before,
+.fa-address-card-o:before {
+  content: "\f2bc";
+}
+.fa-user-circle:before {
+  content: "\f2bd";
+}
+.fa-user-circle-o:before {
+  content: "\f2be";
+}
+.fa-user-o:before {
+  content: "\f2c0";
+}
+.fa-id-badge:before {
+  content: "\f2c1";
+}
+.fa-drivers-license:before,
+.fa-id-card:before {
+  content: "\f2c2";
+}
+.fa-drivers-license-o:before,
+.fa-id-card-o:before {
+  content: "\f2c3";
+}
+.fa-quora:before {
+  content: "\f2c4";
+}
+.fa-free-code-camp:before {
+  content: "\f2c5";
+}
+.fa-telegram:before {
+  content: "\f2c6";
+}
+.fa-thermometer-4:before,
+.fa-thermometer:before,
+.fa-thermometer-full:before {
+  content: "\f2c7";
+}
+.fa-thermometer-3:before,
+.fa-thermometer-three-quarters:before {
+  content: "\f2c8";
+}
+.fa-thermometer-2:before,
+.fa-thermometer-half:before {
+  content: "\f2c9";
+}
+.fa-thermometer-1:before,
+.fa-thermometer-quarter:before {
+  content: "\f2ca";
+}
+.fa-thermometer-0:before,
+.fa-thermometer-empty:before {
+  content: "\f2cb";
+}
+.fa-shower:before {
+  content: "\f2cc";
+}
+.fa-bathtub:before,
+.fa-s15:before,
+.fa-bath:before {
+  content: "\f2cd";
+}
+.fa-podcast:before {
+  content: "\f2ce";
+}
+.fa-window-maximize:before {
+  content: "\f2d0";
+}
+.fa-window-minimize:before {
+  content: "\f2d1";
+}
+.fa-window-restore:before {
+  content: "\f2d2";
+}
+.fa-times-rectangle:before,
+.fa-window-close:before {
+  content: "\f2d3";
+}
+.fa-times-rectangle-o:before,
+.fa-window-close-o:before {
+  content: "\f2d4";
+}
+.fa-bandcamp:before {
+  content: "\f2d5";
+}
+.fa-grav:before {
+  content: "\f2d6";
+}
+.fa-etsy:before {
+  content: "\f2d7";
+}
+.fa-imdb:before {
+  content: "\f2d8";
+}
+.fa-ravelry:before {
+  content: "\f2d9";
+}
+.fa-eercast:before {
+  content: "\f2da";
+}
+.fa-microchip:before {
+  content: "\f2db";
+}
+.fa-snowflake-o:before {
+  content: "\f2dc";
+}
+.fa-superpowers:before {
+  content: "\f2dd";
+}
+.fa-wpexplorer:before {
+  content: "\f2de";
+}
+.fa-meetup:before {
+  content: "\f2e0";
+}
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+.sr-only-focusable:active,
+.sr-only-focusable:focus {
+  position: static;
+  width: auto;
+  height: auto;
+  margin: 0;
+  overflow: visible;
+  clip: auto;
+}

File diff suppressed because it is too large
+ 1 - 1
bower_components/font-awesome/css/font-awesome.min.css


BIN
bower_components/font-awesome/fonts/FontAwesome.otf


BIN
bower_components/font-awesome/fonts/fontawesome-webfont.eot


File diff suppressed because it is too large
+ 6 - 193
bower_components/font-awesome/fonts/fontawesome-webfont.svg


BIN
bower_components/font-awesome/fonts/fontawesome-webfont.ttf


BIN
bower_components/font-awesome/fonts/fontawesome-webfont.woff


BIN
bower_components/font-awesome/fonts/fontawesome-webfont.woff2


+ 1 - 1
bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.js

@@ -54,7 +54,7 @@ and dependencies (minified).
 		}else{
 			/* load jquery-mousewheel plugin (via CDN) if it's not present or not loaded via RequireJS 
 			(works when mCustomScrollbar fn is called on window load) */
-			$.event.special.mousewheel || $("head").append(decodeURI("%3Cscript src="+_dlp+"//"+_url+"%3E%3C/script%3E"));
+			//$.event.special.mousewheel || $("head").append(decodeURI("%3Cscript src="+_dlp+"//"+_url+"%3E%3C/script%3E"));
 		}
 	}
 	init();

+ 3 - 3
css/style.css

@@ -5,7 +5,7 @@
  *   version 1.1
  *
 */
-@import url(https://fonts.googleapis.com/css?family=Roboto:100,400,500,300,700);
+/*@import url(https://fonts.googleapis.com/css?family=Roboto:100,400,500,300,700);*/
 .preloader {
   z-index: 99999;
   position: fixed !important;
@@ -473,7 +473,7 @@ a.text-info:hover {
 
 .gn-menu-main li.gn-trigger {
   position: relative;
-  width: 66px;
+  width: 50px;
   -webkit-touch-callout: none;
   -webkit-user-select: none;
      -moz-user-select: none;
@@ -664,7 +664,7 @@ a.text-info:hover {
 }
 
 .menu-toggle.gn-selected .cross span:nth-child(2) {
-  width: 52%;
+  width: 53%;
   -webkit-transition-delay: .375s;
           transition-delay: .375s;
 }

+ 6 - 4
error.php

@@ -29,11 +29,13 @@ $codes = array(
 
 @$errorTitle = $codes[$status][0];
 @$message = $codes[$status][1];
+@$errorImage = $codes[$status][2];
 
 if ($errorTitle == false || strlen($status) != 3) {
     
     $message = 'Please supply a valid status code.';
     $errorTitle = "Error";
+    $errorImage = "confused";
 
 }
 
@@ -128,9 +130,9 @@ endif;
 
         <title><?=$errorTitle;?></title>
 
-        <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
-        <link rel="stylesheet" href="bower_components/Waves/dist/waves.min.css"> 
-        <link rel="stylesheet" href="css/style.css">
+        <link rel="stylesheet" href="/bower_components/bootstrap/dist/css/bootstrap.min.css">
+        <link rel="stylesheet" href="/bower_components/bower_components/Waves/dist/waves.min.css"> 
+        <link rel="stylesheet" href="/css/style.css">
         
     </head>
 
@@ -158,7 +160,7 @@ endif;
                 
                                     <div class="big-box text-left">
                 
-                                        <center><img src="images/<?=$codes[$status][2];?>.png" style="height: 200px;"></center>
+                                        <center><img src="images/<?=$errorImage;?>.png" style="height: 200px;"></center>
                                         <h4 style="color: <?=$topbar;?>;" class="text-center"><?php echo $message;?></h4>
 
                                         <button style="background:<?=$topbar;?>;" onclick="goBack()" type="button" class="btn log-in btn-block btn-primary text-uppercase waves waves-effect waves-float"><text style="color:<?=$topbartext;?>;"><?php echo $language->translate("GO_BACK");?></text></button>					                                    

+ 33 - 17
index.php

@@ -143,8 +143,8 @@ if($action == "createLocation") :
         if($postName !== "action") :
         
             if(substr($postValue, -1) == "/") : $postValue = rtrim($postValue, "/"); endif;
-        
-                $postValue = str_replace("\\","/", $postValue);
+    
+            $postValue = str_replace("\\","/", $postValue);
         
             $databaseData .= $postName . " = \"" . $postValue . "\"\r\n";
         
@@ -268,17 +268,23 @@ else :
     endif;
 
     $userpic = md5( strtolower( trim( $USER->email ) ) );
-    if(LOADINGICON !== "") : 
-
-        $loadingIcon = LOADINGICON; 
-
-    endif;
+    
+    if(LOADINGICON !== "") : $loadingIcon = LOADINGICON; endif;
 
     if(SLIMBAR == "true") : $slimBar = "30"; $userSize = "25"; else : $slimBar = "56"; $userSize = "40"; endif;
     
     if($USER->authenticated) : 
 
-        $showPic = "<img src='https://www.gravatar.com/avatar/$userpic?s=$userSize' class='img-circle'>"; 
+        if(GRAVATAR == "true") :
+
+            $showPic = "<img src='https://www.gravatar.com/avatar/$userpic?s=$userSize' class='img-circle'>";
+
+        else: 
+        
+            //$showPic = "<login class='login-btn text-uppercase'>" . $language->translate("MENU") . "</login>";
+            $showPic = "<i class=\"mdi mdi-account-box-outline\"></i>";
+
+        endif;
 
     else : 
 
@@ -315,6 +321,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
   \::/  /   |:\/__/   \::/  /    /:/  /    |:/  /   \:\__\    \:\__\    |:\/__/ 
    \/__/     \|__|     \/__/     \/__/     \/__/     \/__/     \/__/     \|__|  
 
+                      [Organizr Version: <?php echo INSTALLEDVERSION; ?> - By: CauseFX]
 
 -->
 <!DOCTYPE html>
@@ -354,6 +361,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 		<script type="text/javascript" src="<?=$baseURL;?>js/user.js"></script>
 
         <link rel="stylesheet" href="<?=$baseURL;?>css/style.css">
+        <link rel="stylesheet" href="bower_components/animate.css/animate.min.css">
 
         <link rel="icon" type="image/png" href="<?=$baseURL;?>images/favicon/android-chrome-192x192.png" sizes="192x192">
         <link rel="apple-touch-icon" sizes="180x180" href="<?=$baseURL;?>images/favicon/apple-touch-icon.png">
@@ -479,6 +487,10 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 
             color: <?=$topbartext;?>;
 
+        }li.dropdown.some-btn .mdi:hover {
+
+            color: <?=$hoverbg;?>;
+
         }.nav>li>a:focus, .nav>li>a:hover {
 
             text-decoration: none;
@@ -494,7 +506,7 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
 
         }.main-wrapper{
             
-            /*position: absolute !important;*/
+            position: absolute !important;
 
         }#menu-toggle span {
             background: <?=$topbartext;?>;
@@ -601,11 +613,11 @@ if(file_exists("images/settings2.png")) : $iconRotate = "false"; $settingsIcon =
         }.menu-toggle .cross span:nth-child(2) {
         
             left: -9px;
-            top: 40px;
+            top: 41px;
         
         }.menu-toggle.gn-selected .cross span:nth-child(2) {
          
-            width: 49%;
+            width: 53%;
             
         }.menu-toggle.gn-selected .cross span:nth-child(1) {
             
@@ -826,7 +838,7 @@ endif; ?>
                     
                     <ul class="nav navbar-right right-menu">
                         
-                        <li class="dropdown notifications">
+                        <li class="dropdown some-btn">
                             
                             <?php if($configReady == "Yes") : if(!$USER->authenticated) : ?>
                             
@@ -1116,8 +1128,10 @@ endif; ?>
                 <br>
                 
                 <div class="content-box profile-sidebar box-shadow">
-                
-                    <img src="https://www.gravatar.com/avatar/<?=$userpic;?>?s=100&d=mm" class="img-responsive img-circle center-block" alt="user" https:="" www.gravatar.com="" avatar="">
+                    
+                    <?php if(GRAVATAR == "true") : ?>
+                    <img src="https://www.gravatar.com/avatar/<?=$userpic;?>?s=100&d=mm" class="img-responsive img-circle center-block" alt="user">
+                    <?php endif; ?>
                 
                     <div class="profile-usertitle">
                 
@@ -1435,6 +1449,8 @@ endif; ?>
         <!--Custom Scripts-->
         <script src="<?=$baseURL;?>js/common.js"></script>
         <script src="<?=$baseURL;?>js/mousetrap.min.js"></script>
+        
+        <script src="js/jquery.mousewheel.min.js" type="text/javascript"></script>
 
         <script>
 
@@ -1702,7 +1718,7 @@ endif; ?>
 
             if (defaultTab){
 
-                $("#content").html('<div class="iframe active" data-content-url="'+defaultTab+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" frameborder="0" style="width:100%; height:100%;" src="'+defaultTab+'"></iframe></div>');
+                $("#content").html('<div class="iframe active" data-content-url="'+defaultTab+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" mozallowfullscreen="true" frameborder="0" style="width:100%; height:100%; position: absolute;" src="'+defaultTab+'"></iframe></div>');
                 document.getElementById('main-wrapper').focus();
                 
             }
@@ -1887,7 +1903,7 @@ endif; ?>
 
                     $("#content div[class^='iframe active']").attr("class", "iframe hidden");
 
-                    $( '<div class="iframe active" data-content-url="'+thisid+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%;" src="'+thisid+'"></iframe></div>' ).appendTo( "#content" );
+                    $( '<div class="iframe active" data-content-url="'+thisid+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%; position: absolute;" src="'+thisid+'"></iframe></div>' ).appendTo( "#content" );
                     
                     document.title = thistitle;
                     
@@ -1957,7 +1973,7 @@ endif; ?>
 
                     $("#contentRight div[class^='iframe active']").attr("class", "iframe hidden");
 
-                    $( '<div class="iframe active" data-content-url="'+thisid+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%;" src="'+thisid+'"></iframe></div>' ).appendTo( "#contentRight" );
+                    $( '<div class="iframe active" data-content-url="'+thisid+'"><iframe scrolling="auto" sandbox="allow-forms allow-same-origin allow-pointer-lock allow-scripts allow-popups allow-modals allow-top-navigation" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%; position: absolute;" src="'+thisid+'"></iframe></div>' ).appendTo( "#contentRight" );
                     
                     document.title = thistitle;
                     

+ 5 - 11
js/common.js

@@ -1,10 +1,3 @@
-/*
- *
- *   ADVANTAGE - Responsive Admin Theme
- *   version 1.1
- *
-*/
-
 $(window).on('load', function(){
     //Preloader
     setTimeout(function(){
@@ -142,6 +135,10 @@ $(function () {
     if (localStorageSupport) {
 
         var fixNav = localStorage.getItem("fixNav");
+        
+        if(  fixNav === null ) {
+            localStorage.setItem("fixNav",'on');
+        }
 
         if (fixNav == 'on') {
           $('.gn-menu-wrapper').addClass("gn-open-fixed");
@@ -161,10 +158,7 @@ $(function () {
 
 });
 
-
 // check if browser support HTML5 local storage
 function localStorageSupport() {
     return (('localStorage' in window) && window['localStorage'] !== null)
-}
-
-
+}

File diff suppressed because it is too large
+ 7 - 0
js/jquery.mousewheel.min.js


+ 3 - 1
lang/de.ini

@@ -168,4 +168,6 @@ SHOW_MORE = "Mehr zeigen"
 SHOW_LESS = "Weniger zeigen"
 EDIT_CUSTOM_CSS = "Eigenes CSS"
 CUSTOM_COMPLETE = "EIGENES CSS GESPEICHERT!"
-SAVE_CSS = "CSS speichern"
+SAVE_CSS = "CSS speichern"
+MENU = "Menu"
+GRAVATAR = "Gravatar"

+ 3 - 1
lang/en.ini

@@ -168,4 +168,6 @@ SHOW_MORE = "Show More"
 SHOW_LESS = "Show Less"
 EDIT_CUSTOM_CSS = "Custom CSS"
 CUSTOM_COMPLETE = "CUSTOM CSS SAVED!"
-SAVE_CSS = "Save CSS"
+SAVE_CSS = "Save CSS"
+MENU = "Menu"
+GRAVATAR = "Gravatar"

+ 3 - 1
lang/es.ini

@@ -168,4 +168,6 @@ SHOW_MORE = "Show More"
 SHOW_LESS = "Show Less"
 EDIT_CUSTOM_CSS = "Custom CSS"
 CUSTOM_COMPLETE = "CUSTOM CSS SAVED!"
-SAVE_CSS = "Save CSS"
+SAVE_CSS = "Save CSS"
+MENU = "Menu"
+GRAVATAR = "Gravatar"

+ 3 - 1
lang/fr.ini

@@ -168,4 +168,6 @@ SHOW_MORE = "Show More"
 SHOW_LESS = "Show Less"
 EDIT_CUSTOM_CSS = "Custom CSS"
 CUSTOM_COMPLETE = "CUSTOM CSS SAVED!"
-SAVE_CSS = "Save CSS"
+SAVE_CSS = "Save CSS"
+MENU = "Menu"
+GRAVATAR = "Gravatar"

+ 3 - 1
lang/it.ini

@@ -168,4 +168,6 @@ SHOW_MORE = "Show More"
 SHOW_LESS = "Show Less"
 EDIT_CUSTOM_CSS = "Custom CSS"
 CUSTOM_COMPLETE = "CUSTOM CSS SAVED!"
-SAVE_CSS = "Save CSS"
+SAVE_CSS = "Save CSS"
+MENU = "Menu"
+GRAVATAR = "Gravatar"

+ 3 - 1
lang/nl.ini

@@ -168,4 +168,6 @@ SHOW_MORE = "Show More"
 SHOW_LESS = "Show Less"
 EDIT_CUSTOM_CSS = "Custom CSS"
 CUSTOM_COMPLETE = "CUSTOM CSS SAVED!"
-SAVE_CSS = "Save CSS"
+SAVE_CSS = "Save CSS"
+MENU = "Menu"
+GRAVATAR = "Gravatar"

+ 3 - 1
lang/pl.ini

@@ -168,4 +168,6 @@ SHOW_MORE = "Pokaż więcej"
 SHOW_LESS = "Pokaż mniej"
 EDIT_CUSTOM_CSS = "Własne CSS"
 CUSTOM_COMPLETE = "WŁASNE CSS ZAPISANE!"
-SAVE_CSS = "Zapisz CSS"
+SAVE_CSS = "Zapisz CSS"
+MENU = "Menu"
+GRAVATAR = "Gravatar"

+ 13 - 3
settings.php

@@ -1184,7 +1184,7 @@ endif; ?>
 
                                                             <th scope="row"><?=$countUsers;?></th>
 
-                                                            <td><i class="userpic"><img src="https://www.gravatar.com/avatar/<?=$userpic;?>?s=25&d=mm" class="img-circle"></i> &nbsp; <?=$row['username'];?></td>
+                                                            <td><?php if(GRAVATAR == "true") : ?><i class="userpic"><img src="https://www.gravatar.com/avatar/<?=$userpic;?>?s=25&d=mm" class="img-circle"></i> &nbsp; <?php endif; ?><?=$row['username'];?></td>
                                                             
                                                             <td><?=$row['email'];?></td>
 
@@ -1373,6 +1373,15 @@ endif; ?>
 
                                                         </div>
                                                         
+                                                        <div class="form-group">
+                                                            <?php  if(GRAVATAR == "true") : $enableGravatar = "checked"; else : $enableGravatar = ""; endif;?>
+                                                            <input id="" class="switcher switcher-success" value="false" name="gravatar" type="hidden">
+                                                            <input id="gravatar" class="switcher switcher-success" value="true" name="gravatar" type="checkbox" <?php echo $enableGravatar;?>>
+
+                                                            <label for="gravatar"></label><?php echo $language->translate("GRAVATAR");?>
+
+                                                        </div>
+                                                        
                                                     </div>
                                                     
                                                     <button type="submit" class="class='btn waves btn-labeled btn-success btn btn-sm pull-right text-uppercase waves-effect waves-float"><span class="btn-label"><i class="fa fa-floppy-o"></i></span>Save</button>
@@ -2116,6 +2125,7 @@ endif;?></textarea>
         <script src="js/jqueri_ui_custom/jquery-ui.min.js"></script>
         <script src="js/jquery.filer.min.js" type="text/javascript"></script>
 	    <script src="js/custom.js" type="text/javascript"></script>
+	    <script src="js/jquery.mousewheel.min.js" type="text/javascript"></script>
         
         <!--Data Tables-->
         <script src="bower_components/DataTables/media/js/jquery.dataTables.js"></script>
@@ -2806,7 +2816,7 @@ endif;?></textarea>
                 dataType: "json",
                 success: function(github) {
                     
-                    var currentVersion = "1.05";
+                    var currentVersion = "<?php echo INSTALLEDVERSION;?>";
                    
                     infoTabVersion = $('#about').find('#version');
                     infoTabVersionHistory = $('#about').find('#versionHistory');
@@ -2823,7 +2833,7 @@ endif;?></textarea>
                                    
                         }
                         
-                        $(infoTabVersionHistory).append('<li style="display: none"><time class="cbp_tmtime" datetime="' + v.published_at + '"><span>' + v.published_at.substring(0,10) + '</span> <span>' + v.tag_name + '</span></time><div class="cbp_tmicon cbp_tmicon-earth animated jello"></div><div class="cbp_tmlabel"><h2 class="text-uppercase">' + v.name + '</h2><p>' + v.body + '</p></div></li>');
+                        $(infoTabVersionHistory).append('<li style="display: none"><time class="cbp_tmtime" datetime="' + v.published_at + '"><span>' + v.published_at.substring(0,10) + '</span> <span>' + v.tag_name + '</span></time><div class="cbp_tmicon animated jello"><i class="fa fa-github-alt"></i></div><div class="cbp_tmlabel"><h2 class="text-uppercase">' + v.name + '</h2><p>' + v.body + '</p></div></li>');
                         
                         size_li = $("#versionHistory li").size();
                         

+ 2 - 0
user.php

@@ -10,6 +10,7 @@
     $databaseConfig = parse_ini_file('databaseLocation.ini.php', true);
     define('USER_HOME', $databaseConfig['databaseLocation'] . '/users/');
     define('DATABASE_LOCATION', $databaseConfig['databaseLocation'] . '/');
+    define('INSTALLEDVERSION', '1.08');
     if(!empty($databaseConfig['timezone'])) : define('TIMEZONE', $databaseConfig['timezone']); else : define('TIMEZONE', 'America/Los_Angeles'); endif;
     if(!empty($databaseConfig['titleLogo'])) : define('TITLELOGO', $databaseConfig['titleLogo']); else : define('TITLELOGO', ''); endif;
     if(!empty($databaseConfig['loadingIcon'])) : define('LOADINGICON', $databaseConfig['loadingIcon']); else : define('LOADINGICON', ''); endif;
@@ -19,6 +20,7 @@
     if(!empty($databaseConfig['slimBar'])) : define('SLIMBAR', $databaseConfig['slimBar']); else : define('SLIMBAR', 'true'); 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['gravatar'])) : define('GRAVATAR', $databaseConfig['gravatar']); else : define('GRAVATAR', 'true'); endif;
     if(!empty($databaseConfig['notifyEffect'])) : define('NOTIFYEFFECT', $databaseConfig['notifyEffect']); else : define('NOTIFYEFFECT', 'bar-slidetop'); endif;
     if(file_exists('custom.css')) : define('CUSTOMCSS', 'true'); else : define('CUSTOMCSS', 'false'); endif; 
     $notifyExplode = explode("-", NOTIFYEFFECT);

Some files were not shown because too many files changed in this diff