Explorar el Código

Added More Featues and Fixed Some Bugs

Added User Management and Theme Support
causefx hace 9 años
padre
commit
c74e80e5a9

+ 4 - 4
css/style.css

@@ -1593,7 +1593,7 @@ body {
 }
 
 .nav-tabs > li {
-  margin-right: 6px;
+  /*margin-right: 6px;*/
   background: none;
   border: none;
 }
@@ -1608,7 +1608,7 @@ body {
 }
 
 .nav-tabs > li > a {
-  padding: 20px;
+  /*padding: 20px;*/
   font-size: 16px;
   font-weight: 400;
   margin: 0;
@@ -1688,7 +1688,7 @@ body {
 }
 
 .tabs-with-bg {
-  background: #f6f6f6;
+  background: #e7ebec;
 }
 
 .tabs-with-bg .nav-tabs {
@@ -1707,7 +1707,7 @@ body {
 }
 
 .tabs-with-bg i {
-  margin-right: 8px;
+  /*margin-right: 8px;*/
 }
 
 .tabs-with-bg .tab-pane {

BIN
icons/couchpotato.png


BIN
icons/deluge.png


BIN
icons/emby.png


BIN
icons/favicon/android-chrome-192x192.png


BIN
icons/favicon/android-chrome-512x512.png


BIN
icons/favicon/apple-touch-icon.png


+ 9 - 0
icons/favicon/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+  <msapplication>
+    <tile>
+      <square150x150logo src="icons/favicon/mstile-150x150.png"/>
+      <TileColor>#2d89ef</TileColor>
+    </tile>
+  </msapplication>
+</browserconfig>

BIN
icons/favicon/favicon-16x16.png


BIN
icons/favicon/favicon-32x32.png


BIN
icons/favicon/favicon.ico


+ 17 - 0
icons/favicon/manifest.json

@@ -0,0 +1,17 @@
+{
+	"name": "Organizr",
+	"icons": [
+		{
+			"src": "icons\/favicon\/android-chrome-192x192.png",
+			"sizes": "192x192",
+			"type": "image\/png"
+		},
+		{
+			"src": "icons\/favicon\/android-chrome-512x512.png",
+			"sizes": "512x512",
+			"type": "image\/png"
+		}
+	],
+	"theme_color": "#2d89ef",
+	"display": "standalone"
+}

BIN
icons/favicon/mstile-150x150.png


+ 33 - 0
icons/favicon/safari-pinned-tab.svg

@@ -0,0 +1,33 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
+ "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
+ width="1024.000000pt" height="1024.000000pt" viewBox="0 0 1024.000000 1024.000000"
+ preserveAspectRatio="xMidYMid meet">
+<metadata>
+Created by potrace 1.11, written by Peter Selinger 2001-2013
+</metadata>
+<g transform="translate(0.000000,1024.000000) scale(0.100000,-0.100000)"
+fill="#000000" stroke="none">
+<path d="M4755 9824 c-382 -38 -510 -57 -745 -109 -391 -87 -861 -273 -1235
+-488 -185 -106 -464 -304 -655 -462 -127 -106 -458 -432 -587 -578 -168 -190
+-401 -516 -532 -742 -239 -411 -443 -976 -524 -1450 -163 -945 -54 -1940 300
+-2754 376 -865 1078 -1664 1914 -2176 504 -309 1097 -524 1684 -609 331 -49
+857 -65 1175 -37 812 72 1503 312 2165 754 434 290 828 662 1187 1122 411 527
+708 1177 837 1835 142 722 126 1510 -45 2180 -171 668 -452 1221 -903 1775
+-210 258 -628 657 -896 855 -526 389 -1107 655 -1715 784 -366 78 -563 98
+-1010 101 -206 1 -393 1 -415 -1z m355 -1508 l0 -603 -127 -7 c-401 -22 -702
+-100 -1028 -266 -267 -135 -443 -265 -665 -489 -233 -235 -370 -423 -495 -676
+-158 -322 -231 -596 -257 -972 l-12 -173 -605 0 -604 0 6 183 c21 626 194
+1214 515 1747 162 270 323 472 581 731 250 250 449 414 686 566 435 278 962
+470 1460 533 203 25 237 28 388 29 l157 1 0 -604z m525 574 c88 -11 226 -34
+307 -50 708 -145 1367 -516 1898 -1067 686 -712 1035 -1518 1076 -2483 l7
+-160 -605 0 -605 0 -7 133 c-18 365 -98 679 -251 992 -150 306 -351 567 -617
+802 -118 104 -258 213 -274 213 -5 0 -156 -854 -335 -1897 l-326 -1898 27 -55
+c89 -179 118 -378 85 -590 -32 -211 -120 -376 -286 -535 -186 -178 -402 -265
+-659 -265 -311 0 -579 136 -772 390 -64 84 -132 224 -158 325 -42 159 -37 375
+12 534 89 291 361 557 651 636 l63 17 747 1712 c411 941 750 1721 753 1732 6
+24 -42 52 -226 131 -282 122 -557 184 -877 199 l-143 7 0 605 0 605 178 -6
+c97 -3 249 -15 337 -27z"/>
+</g>
+</svg>

BIN
icons/headphones.png


BIN
icons/lazylibrarian.png


BIN
icons/mylar.png


BIN
icons/nzbget.png


BIN
icons/nzbhydra.png


BIN
icons/ombi.png


BIN
icons/openvpn.png


BIN
icons/plex.png


BIN
icons/plexpy.png


BIN
icons/sabnzbd.png


BIN
icons/settings.png


BIN
icons/sickbeard.png


BIN
icons/sickrage.png


BIN
icons/sonarr.png


BIN
icons/watcher.png


BIN
icons/webmin.png


+ 194 - 112
index.php

@@ -64,6 +64,19 @@ if($tabSetup == "No") :
     if($USER->authenticated && $USER->role == "admin") :
 
         $result = $file_db->query('SELECT * FROM tabs WHERE active = "true"');
+        $getsettings = $file_db->query('SELECT * FROM tabs WHERE active = "true"');
+        
+        $settingsicon = "No";
+
+        foreach($getsettings as $row) :
+
+            if($row['iconurl'] && $settingsicon == "No") :
+
+                $settingsicon = "Yes";
+
+            endif;
+
+        endforeach;
 
     elseif($USER->authenticated && $USER->role == "user") :
 
@@ -134,7 +147,7 @@ endif;
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="msapplication-tap-highlight" content="no" />
 
-        <title><?=$title;?> - Organizr</title>
+        <title><?=$title;?><?php if($title !== "Organizr") :  echo "- Organizr"; endif; ?></title>
 
         <link rel="stylesheet" href="bower_components/bootstrap/dist/css/bootstrap.min.css">
         <link rel="stylesheet" href="bower_components/font-awesome/css/font-awesome.min.css">
@@ -157,8 +170,15 @@ endif;
 
         <link rel="stylesheet" href="css/style.css">
 
-        <link rel="icon" href="img/favicon.ico" type="image/x-icon" />
-        <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon" />
+        
+        <link rel="apple-touch-icon" sizes="180x180" href="icons/favicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="icons/favicon/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="icons/favicon/favicon-16x16.png" sizes="16x16">
+        <link rel="manifest" href="icons/favicon/manifest.json">
+        <link rel="mask-icon" href="icons/favicon/safari-pinned-tab.svg" color="#2d89ef">
+        <link rel="shortcut icon" href="icons/favicon/favicon.ico">
+        <meta name="msapplication-config" content="icons/favicon/browserconfig.xml">
+        <meta name="theme-color" content="#2d89ef">
         
         <!--[if lt IE 9]>
         <script src="bower_components/html5shiv/dist/html5shiv.min.js"></script>
@@ -167,7 +187,7 @@ endif;
         
     </head>
 
-    <body>
+    <body style="overflow: hidden">
 
         <!--Preloader-->
         <div id="preloader" class="preloader table-wrapper">
@@ -222,7 +242,7 @@ endif;
                 
                 }.la-timer.la-dark {
                     
-                    color: <?=$topbar;?>
+                    color: <?=$topbartext;?>
                 
                 }.refresh-preloader {
                     
@@ -233,7 +253,7 @@ endif;
                     width: 75px;
                     height: 75px;
                     padding-top: 20px;
-                    border-radius: 10px;
+                    border-radius: 100px;
                     background: <?=$sidebar;?>;
                     border: 2px solid <?=$topbar;?>;
                 
@@ -241,11 +261,13 @@ endif;
                     
                     color: <?=$sidebar;?> !important;
                     background: <?=$hoverbg;?>;
+                    border-radius: 100px 0 0 100px;
                 
                 }.gn-menu li.active > a {
                     
                     color: <?=$activetabtext;?> !important;
                     background: <?=$activetabBG;?>;
+                    border-radius: 100px 0 0 100px;
                 
                 }.active {
                     
@@ -300,6 +322,8 @@ endif;
 
                 }.iframe iframe{
 
+                }#menu-toggle span {
+                    background: <?=$topbartext;?>;
                 }
                 
             </style>
@@ -332,18 +356,32 @@ endif;
                         <div class="gn-scroller">
                             
                             <ul class="gn-menu metismenu">
-                                <?php /*echo str_replace("\n", "<br/>\n\t\t\t", print_r($_POST, true)); 
-                                echo str_replace("\n", "<br/>\n\t\t\t", print_r($USER->info_log, true)); 
-                                echo str_replace("\n", "<br/>\n\t\t\t", print_r($USER->error_log, true)); */?>
+
                                 <!--Start Tab List-->
                                 
                                 <?php if($tabSetup == "No") : foreach($result as $row) : 
                                 
                                 if($row['defaultz'] == "true") : $defaultz = "active"; else : $defaultz = ""; endif;?>
                                 
-                                <li class="tab-item <?=$defaultz;?>" id="<?=$row['url'];?>x">
+                                <li window="<?=$row['window'];?>" class="tab-item <?=$defaultz;?>" id="<?=$row['url'];?>x">
+                                    
+                                    <a class="tab-link">
+                                        
+                                        <?php if($row['iconurl']) : ?>
+                                        
+                                            <i style="font-size: 19px; padding: 0 10px; font-size: 19px;">
+                                                <img src="<?=$row['iconurl'];?>" style="height: 30px; margin-top: -2px;">
+                                            </i>
+                                        
+                                        <?php else : ?>
+                                        
+                                            <i class="fa <?=$row['icon'];?>"></i>
+    
+                                        <?php endif; ?>
+                                        
+                                        <?=$row['name'];?>
                                     
-                                    <a class="tab-link" href="#"><i class="fa <?=$row['icon'];?>"></i><?=$row['name'];?></a>
+                                    </a>
 
                                 </li>
                                 
@@ -352,13 +390,26 @@ endif;
                                 <?php if($USER->authenticated && $USER->role == "admin") :?>
                                 <li class="tab-item <?=$settingsActive;?>" id="settings.phpx">
                                                             
-                                    <a class="tab-link" href="#"><i class="fa fa-key"></i>Settings</a>
+                                    <a class="tab-link">
+                                        
+                                        <?php if($settingsicon = "Yes") :
+                                        
+                                            echo '<i style="font-size: 19px; padding: 0 10px; font-size: 19px;">
+                                                <img id="settings-icon" src="icons/settings.png" style="height: 30px; margin-top: -2px;"></i>';
+                                        
+                                        else :
+                                        
+                                            echo '<i class="fa fa-key"></i>';
+                                        
+                                        endif; ?>
+                                        
+                                        Settings
+                                    
+                                    </a>
                                 
                                 </li>
                                 <?php endif;?>
-
-                                <?php if(!$USER->authenticated && $tabSetup == "Yes" && $needSetup == "No") : echo "Sign in with the icon at the bottom"; endif; ?>
-
+                                
                                 <!--End Tab List-->
                            
                             </ul>
@@ -369,12 +420,12 @@ endif;
                         <div class="bottom-bnts">
                             
                             <!--<li class="tab-item profile" id="settings.phpx"><i class="mdi mdi-account"></i></li>-->
-                            <a class="fix-nav" href="#"><i class="mdi mdi-pin"></i></a>
+                            <a class="fix-nav"><i class="mdi mdi-pin"></i></a>
                             <?php if(!$USER->authenticated) : ?>
-                            <a class="log-in" href="#"><i class="mdi mdi-login"></i></a>
+                            <a class="log-in"><i class="mdi mdi-login"></i></a>
                             <?php endif ?>
                             <?php if($USER->authenticated) : ?>
-                            <a class="logout" href="#"><i class="mdi mdi-logout"></i></a>
+                            <a class="logout"><i class="mdi mdi-logout"></i></a>
                             <?php endif ?>
                         
                         </div>
@@ -444,7 +495,7 @@ endif;
 								
 								                        <h4 class="text-center">Create an account for Admin Access</h4>
 								
-                        								<form class="controlbox" name="new user registration" id="registration" action="index.php" method="POST">
+                        								<form class="controlbox" name="new user registration" id="registration" action="" method="POST">
                         								    
                         								    <input type="hidden" name="op" value="register"/>
                         								    <input type="hidden" name="sha1" value=""/>
@@ -577,13 +628,13 @@ endif;
         <?php if(!$USER->authenticated) : ?>
         <div class="login-modal modal fade">
             
-            <div class="gray-bg table-wrapper">
+            <div style="background:<?=$topbar;?>;" class="table-wrapper">
                 
                 <div class="table-row">
                     
                     <div class="table-cell text-center">
                         
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                        <button style="color:<?=$topbartext;?>;" type="button" class="close" data-dismiss="modal" aria-label="Close">
                             
                             <span aria-hidden="true">&times;</span>
                         
@@ -593,9 +644,9 @@ endif;
                             
                             <div class="content-box">
                                 
-                                <div class="red-bg biggest-box">
+                                <div style="background:<?=$topbartext;?>;" class="biggest-box">
 
-                                    <h1 class="zero-m text-uppercase">Welcome</h1>
+                                    <h1 style="color:<?=$topbar;?>;" class="zero-m text-uppercase">Welcome</h1>
 
                                 </div>
                                 
@@ -603,7 +654,7 @@ endif;
                                     
                                     <h4 class="text-center">Login</h4>
                                     
-                                    <form name="log in" id="login" action="index.php" method="POST">
+                                    <form name="log in" id="login" action="" method="POST">
                                         
                                         <div class="form-group">
                                             
@@ -619,7 +670,7 @@ endif;
                                         
                                         </div>
 
-                                        <button type="submit" class="red-bg btn btn-block btn-info text-uppercase waves" value="log in" onclick="User.processLogin()">Login</button>
+                                        <button style="background:<?=$topbartext;?>;" type="submit" class="btn btn-block btn-info text-uppercase waves" value="log in" onclick="User.processLogin()"><text style="color:<?=$topbar;?>;">Login</text></button>
 
                                     </form>                                   
                                     
@@ -638,7 +689,7 @@ endif;
         </div>
         <?php endif;?>
         <?php if($USER->authenticated) : ?>
-        <div class="logout-modal modal fade">
+        <div style="background:<?=$topbar;?>;" class="logout-modal modal fade">
             
             <div class="table-wrapper" style="background: <?=$topbar;?>">
             
@@ -650,18 +701,21 @@ endif;
                         
                             <div class="content-box">
                             
-                                <div class="gray-bg biggest-box">
+                                <div style="background:<?=$topbartext;?>;" class="biggest-box">
                                 
-                                    <form name="log out" id="logout" action="index.php" method="POST">
+                                    <form name="log out" id="logout" action="" method="POST">
+                                        
 				                        <input type="hidden" name="op" value="logout">
+                                        
                                         <input type="hidden" name="username"value="<?php echo $_SESSION["username"]; ?>" >
 				
 				
 			
-                                    <h3 class="zero-m text-uppercase">Do you want to logout?</h3>
+                                        <h3 style="color:<?=$topbar;?>;" class="zero-m text-uppercase">Do you want to logout?</h3>
                                         
-                                    <a href="#" id="logoutSubmit" class="i-block" data-dismiss="modal">Yes</a>
-                                    <a href="#" class="i-block" data-dismiss="modal">No</a>
+                                        <a style="color:<?=$topbar;?>;" href="#" id="logoutSubmit" class="i-block" data-dismiss="modal">Yes</a>
+                                        
+                                        <a style="color:<?=$topbar;?>;" href="#" class="i-block" data-dismiss="modal">No</a>
                                 
                                     </form>
                                     
@@ -709,37 +763,17 @@ endif;
         <script src="js/common.js"></script>
 
         <script>
-        $(function () {
-
-            // show the notification
-           /* setTimeout(function () {
-                // create the notification
-                var notification = new NotificationFx({
-                    message: '<span><?php if(!empty($USER->info_log)) : 
-                    echo $USER->info_log[0]; 
-                    elseif(empty($USER->info_log)) :
-                    echo "Welcome Guest!";
-                    endif;?>
-                    </span>',
-                    layout: 'attached',
-                    effect: 'bouncyflip',
-                    ttl: 5500,
-                    wrapper: document.getElementById("welcome"),
-                    type: 'warning', // notice, warning, success or error
-                });
-                notification.show();
-            }, 1000);*/
             
-            $.smkAlert({
-                text: '<?php if(!empty($USER->info_log)) : 
-                    echo $USER->info_log[0]; 
-                    elseif(empty($USER->info_log)) :
-                    echo "Welcome Guest!";
-                    endif;?>',
-                type: 'info'
-            });
-
-        });
+        function setHeight() {
+            
+            windowHeight = $(window).innerHeight();
+            
+            $("div").find(".iframe").css('height', windowHeight - 56 + "px");
+            
+            $('#content').css('height', windowHeight - 56 + "px");
+            
+        };
+            
 
         $(document).ready(function(){
             
@@ -761,84 +795,132 @@ 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" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%;" src="'+defaultTab+'"></iframe></div>');
             }
             
-            $('#content').css("height", $(window).height() - 56 + "px" );
+            setHeight();
+
+        }); 
+            
+        $(function () {
+            
+            $.smkAlert({
+                text: '<?php if(!empty($USER->info_log)) : 
+                    echo $USER->info_log[0]; 
+                    elseif(empty($USER->info_log)) :
+                    echo "Welcome Guest!";
+                    endif;?>',
+                type: 'info'
+            });
+
+        });
             
-            $("div").find(".iframe").css("height", $(window).height() - 56 + "px" );
+        $('#reload').on('click touchstart', function(){
 
-            $(window).resize(function(){
+            $("i[class^='mdi mdi-refresh']").attr("class", "mdi mdi-refresh fa-spin");
 
-                $('#content').css("height", $(window).height() - 56 + "px" );
-                $("div").find(".iframe").css("height", $(window).height() - 56 + "px" );
+            var activeFrame = $('#content').find('.active').children('iframe');
 
-            });
+            activeFrame.attr('src', activeFrame.attr('src'));
 
-            $('#reload').on('click touchstart', function(){
+            var refreshBox = $('#content').find('.active');
 
-                $("i[class^='mdi mdi-refresh']").attr("class", "mdi mdi-refresh fa-spin");
-                var activeFrame = $('#content').find('.active').children('iframe');
-                activeFrame.attr('src', activeFrame.attr('src'));
-                
-                var refreshBox = $('#content').find('.active');
-                $("<div class='refresh-preloader'><div class='la-timer la-dark'><div></div></div></div>").appendTo(refreshBox).fadeIn(10);
+            $("<div class='refresh-preloader'><div class='la-timer la-dark'><div></div></div></div>").appendTo(refreshBox).fadeIn(10);
 
-                setTimeout(function(){
-                    
-                    var refreshPreloader = refreshBox.find('.refresh-preloader'),
-                    deletedRefreshBox = refreshPreloader.fadeOut(300, function(){
-                        
-                        refreshPreloader.remove();
-                        $("i[class^='mdi mdi-refresh fa-spin']").attr("class", "mdi mdi-refresh");
-                    
-                    });
-                
-                },1000);
+            setTimeout(function(){
+
+                var refreshPreloader = refreshBox.find('.refresh-preloader'),
+                deletedRefreshBox = refreshPreloader.fadeOut(300, function(){
+
+                    refreshPreloader.remove();
+                    $("i[class^='mdi mdi-refresh fa-spin']").attr("class", "mdi mdi-refresh");
+
+                });
+
+            },500);
 
-            })
+        });
             
-            $('#logoutSubmit').on('click touchstart', function(){
+        $("li[id^='settings.phpx']").on('click touchstart', function(){
+
+            $("img[id^='settings-icon']").attr("class", "fa-spin");
+
+            setTimeout(function(){
+
+                $("img[id^='settings-icon']").attr("class", "");
+
+            },1000);
+
+        });
+
+        $('#logoutSubmit').on('click touchstart', function(){
 
-                $( "#logout" ).submit();
+            $( "#logout" ).submit();
+
+        });
+            
+        $(window).resize(function(){
+            
+            setHeight();
 
-            })
+        });
             
-            $("li[class^='tab-item']").on('click touchstart', function(){
+        $("li[class^='tab-item']").on('click touchstart', function(){
                 
-                var thisidfull = $(this).attr("id");
-                var thisid = thisidfull.substr(0, thisidfull.length-1);
-                var currentframe = $("div[data-content-url^='"+thisid+"']");
+            var thisidfull = $(this).attr("id");
+
+            var thisid = thisidfull.substr(0, thisidfull.length-1);
+
+            var currentframe = $("div[data-content-url^='"+thisid+"']");
+
+            if (currentframe.attr("class") == "iframe active") {
+
+                console.log(thisid + " is active already");
+
+            }else if (currentframe.attr("class") == "iframe hidden") {
+
+                console.log(thisid + " is active already but hidden");
+
+                $("div[class^='iframe active']").attr("class", "iframe hidden");
+
+                currentframe.attr("class", "iframe active");
                 
-                if (currentframe.attr("class") == "iframe active") {
-                    console.log(thisid + " is active already");
-                }else if (currentframe.attr("class") == "iframe hidden") {
-                    console.log(thisid + " is active already but hidden");
-                    $("div[class^='iframe active']").attr("class", "iframe hidden");
-                    currentframe.attr("class", "iframe active");
-                    $('#content').css("height", $(window).height() - 56 + "px" );
-                    $("div").find(".iframe").css("height", $(window).height() - 56 + "px" );
-                    $("li[class^='tab-item active']").attr("class", "tab-item");
-                    $(this).attr("class", "tab-item active");
+                setHeight();
+
+                $("li[class^='tab-item active']").attr("class", "tab-item");
+
+                $(this).attr("class", "tab-item active");
 
+            }else {
+
+                
+                
+                if ($(this).attr("window") == "true") {
+                    
+                    window.open(thisid,'_blank');
+                    
                 }else {
+                
                     console.log(thisid + " make new div");
+
                     $("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" allowfullscreen="true" webkitallowfullscreen="true" frameborder="0" style="width:100%; height:100%;" src="'+thisid+'"></iframe></div>' ).appendTo( "#content" );
-                    $('#content').css("height", $(window).height() - 56 + "px" );
-                    $("div").find(".iframe").css("height", $(window).height() - 56 + "px" );
+
+                    setHeight();
+
                     $("li[class^='tab-item active']").attr("class", "tab-item");
-                    $(this).attr("class", "tab-item active");
 
+                    $(this).attr("class", "tab-item active");
+                    
                 }
-                
-            });
 
-        }); 
+            }
+
+        });
         </script>
 
 

+ 4 - 4
js/common.js

@@ -64,11 +64,11 @@ $(function () {
   }
 
   //Smooth scrolling for body
-  $("body").niceScroll({
+  /*$("body").niceScroll({
     railpadding: {top:56,right:0,left:0,bottom:0},
     scrollspeed: 30,
     mousescrollstep: 60
-  });
+  });*/
 
 
   //Waves effect on buttons
@@ -171,8 +171,8 @@ $(function () {
   });
 
   // Full height of content
-  $('#content').css("height", $(window).height() - 56 + "px" );
-  $("div").find(".iframe").css("height", $(window).height() - 56 + "px" );
+  //$('#content').css("height", $(window).height() - 56 + "px" );
+  //$("div").find(".iframe").css("height", $(window).height() - 56 + "px" );
   //Fixed gn-menu
   $('.fix-nav').click(function(e){
     if($(window).width() > 422) {

+ 16 - 2
js/menu/gnmenu.js

@@ -45,14 +45,14 @@
 				/*this.trigger.addEventListener( 'mouseover', function(ev) { self._openIconMenu(); } );*/
 				/*this.trigger.addEventListener( 'onclick', function(ev) { self._closeIconMenu(); } );*/
 			
-				 this.menu.addEventListener( 'mouseover', function(ev) {
+				/* this.menu.addEventListener( 'mouseover', function(ev) {
 					self._openMenu(); 
 					document.addEventListener( self.eventtype, self.bodyClickFn ); 
 				} );
                 this.menu.addEventListener( 'mouseout', function(ev) {
 					self._closeMenu(); 
 					document.addEventListener( self.eventtype, self.bodyClickFn ); 
-				} );
+				} ); */
 			}
 			this.trigger.addEventListener( this.eventtype, function( ev ) {
 				ev.stopPropagation();
@@ -67,6 +67,20 @@
 				}
 			} );
 			this.menu.addEventListener( this.eventtype, function(ev) { ev.stopPropagation(); } );
+            
+            $("li[class^='tab-item']").on('touchstart', function(){
+                
+                if( self.isMenuOpen ) {
+					self._closeMenu();
+					document.removeEventListener( self.eventtype, self.bodyClickFn );
+				}
+				else {
+					self._openMenu();
+					document.addEventListener( self.eventtype, self.bodyClickFn );
+				}
+   
+            });
+            
 		},
 		_openIconMenu : function() {
 			classie.add( this.menu, 'gn-open-part' );

La diferencia del archivo ha sido suprimido porque es demasiado grande
+ 327 - 41
settings.php


+ 2 - 2
user.php

@@ -70,7 +70,7 @@
 
 			// this is the session timeout. If someone hasn't performed any page requests
 			// in [timeout] seconds, they're considered logged out.
-			const time_out = 3600;
+			const time_out = 7200;
 
 			// You'll probably want to change this to something sensible. If your site is
 			// www.sockmonkey.com, then you want this to be "sockmonkey.com"
@@ -615,7 +615,7 @@ EOT;
 			$delete = "DELETE FROM users WHERE username = '$username'";
 			$this->database->exec($delete);
 			$this->info("removed $username from the system");
-			$this->resetSession();
+			//$this->resetSession();
 			return true;
 		}
 

Algunos archivos no se mostraron porque demasiados archivos cambiaron en este cambio