Fixes

Fixed #34 Fixed #37

ajax_remove_file.php

@@ -1,6 +1,6 @@
 <?php
 if(isset($_POST['file'])){
-    $file = 'icons/' . $_POST['file'];
+    $file = 'images/' . $_POST['file'];
     if(file_exists($file)){
         unlink($file);
     }

ajax_upload_file.php

@@ -7,7 +7,7 @@
         'maxSize' => 1, //Maximum Size of files {null, Number(in MB's)}
         'extensions' => array('jpg', 'png'), //Whitelist for file extension. {null, Array(ex: array('jpg', 'png'))}
         'required' => false, //Minimum one file is required for upload {Boolean}
-        'uploadDir' => 'icons/', //Upload directory {String}
+        'uploadDir' => 'images/', //Upload directory {String}
         'title' => array('name'), //New file name {null, String, Array} *please read documentation in README.md
         'removeFiles' => true, //Enable file exclusion {Boolean(extra for jQuery.filer), String($_POST field name containing json data with file names)}
         'replace' => true, //Replace the file if it already exists  {Boolean}

bower_components/malihu-custom-scrollbar-plugin/jquery.mCustomScrollbar.css

@@ -114,6 +114,7 @@ y-axis
 		margin: 0 auto;
 		-webkit-border-radius: 16px; -moz-border-radius: 16px; border-radius: 16px;
 		text-align: center;
+        margin-left: 13px;
 	}
 	
 	.mCSB_scrollTools_vertical.mCSB_scrollTools_onDrag_expand .mCSB_dragger.mCSB_dragger_onDrag_expanded .mCSB_dragger_bar, 

check.php

@@ -146,9 +146,6 @@ $folder = USER_HOME;
 
 
         <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" />
         
     </head>
 

icons/favicon/browserconfig.xml → images/favicon/browserconfig.xml

@@ -2,7 +2,7 @@
 <browserconfig>
   <msapplication>
     <tile>
-      <square150x150logo src="icons/favicon/mstile-150x150.png"/>
+      <square150x150logo src="images/favicon/mstile-150x150.png"/>
       <TileColor>#2d89ef</TileColor>
     </tile>
   </msapplication>

icons/favicon/manifest.json → images/favicon/manifest.json

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

index.php

@@ -183,13 +183,13 @@ $userpic = md5( strtolower( trim( $USER->email ) ) );
         <link rel="stylesheet" href="css/style.css">
 
         
-        <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">
+        <link rel="apple-touch-icon" sizes="180x180" href="images/favicon/apple-touch-icon.png">
+        <link rel="icon" type="image/png" href="images/favicon/favicon-32x32.png" sizes="32x32">
+        <link rel="icon" type="image/png" href="images/favicon/favicon-16x16.png" sizes="16x16">
+        <link rel="manifest" href="images/favicon/manifest.json">
+        <link rel="mask-icon" href="images/favicon/safari-pinned-tab.svg" color="#2d89ef">
+        <link rel="shortcut icon" href="images/favicon/favicon.ico">
+        <meta name="msapplication-config" content="images/favicon/browserconfig.xml">
         <meta name="theme-color" content="#2d89ef">
         
         <!--[if lt IE 9]>
@@ -407,7 +407,7 @@ $userpic = md5( strtolower( trim( $USER->email ) ) );
                                         <?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>';
+                                                <img id="settings-icon" src="images/settings.png" style="height: 30px; margin-top: -2px;"></i>';
                                         
                                         else :
                                         
@@ -432,9 +432,6 @@ $userpic = md5( strtolower( trim( $USER->email ) ) );
                         <div class="bottom-bnts">
                             
                             <a class="fix-nav"><i class="mdi mdi-pin"></i></a>
-                            <?php if($USER->authenticated) : ?>
-                            <a class="logout"><i class="fa fa-sign-out fa-lg"></i></a>
-                            <?php endif ?>
                         
                         </div>
                     

js/custom.js

@@ -18,7 +18,7 @@ $(document).ready(function(){
 									<div class="jFiler-item-thumb-overlay">\
 										<div class="jFiler-item-info">\
 											<div style="display:table-cell;vertical-align: middle;">\
-												<span class="jFiler-item-title"><b title="{{fi-name}}">icons/{{fi-name}}</b></span>\
+												<span class="jFiler-item-title"><b title="{{fi-name}}">images/{{fi-name}}</b></span>\
 												<span class="jFiler-item-others">{{fi-size2}}</span>\
 											</div>\
 										</div>\
@@ -44,7 +44,7 @@ $(document).ready(function(){
 										<div class="jFiler-item-thumb-overlay">\
 											<div class="jFiler-item-info">\
 												<div style="display:table-cell;vertical-align: middle;">\
-													<span class="jFiler-item-title"><b title="{{fi-name}}">icons/{{fi-name}}</b></span>\
+													<span class="jFiler-item-title"><b title="{{fi-name}}">images/{{fi-name}}</b></span>\
 													<span class="jFiler-item-others">{{fi-size2}}</span>\
 												</div>\
 											</div>\

settings.php

@@ -633,10 +633,10 @@ endif;
                                             <textarea id="copyTarget" class="hideCopy" style="left: -9999px; top: 0; position: absolute;"></textarea>
                                            <!-- style="height: 1px; width: 0px; display: block;"!-->
                                             <?php
-                                            $dirname = "icons/";
+                                            $dirname = "images/";
                                             $images = scandir($dirname);
                                             //shuffle($images);
-                                            $ignore = Array(".", "..", "favicon/", "favicon");
+                                            $ignore = Array(".", "..", "favicon/", "favicon", "._.DS_Store", ".DS_Store");
                                             foreach($images as $curimg){
                                                 if(!in_array($curimg, $ignore)) { ?>
 
@@ -1037,12 +1037,40 @@ endif;
                                         
                                         <input type="hidden" name="action" value="addOptionz" />
                                         
-                                        <button id="plexTheme" style="background: #E49F0C" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Plex</button>
+                                        <div class="btn-group">
+                                            
+                                            <button type="button" class="btn btn-dark dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            Choose Theme  <span class="caret"></span>
+                                            </button>
+                                            
+                                            <ul class="dropdown-menu gray-bg">
+                                            
+                                                <li id="plexTheme" style="background: #000000; border-radius: 5px; margin: 5px;"><a style="color: #E49F0C !important;" href="#">Plex</a></li>
+                                            
+                                                <li id="embyTheme" style="background: #212121; border-radius: 5px; margin: 5px;"><a style="color: #52B54B !important;" href="#">Emby</a></li>
+                                                
+                                                <li id="bookTheme" style="background: #3B5998; border-radius: 5px; margin: 5px;"><a style="color: #FFFFFF !important;" href="#">Facebook</a></li>
+                                                
+                                                <li id="spaTheme" style="background: #66BBAE; border-radius: 5px; margin: 5px;"><a style="color: #5B391E !important;" href="#">Spa</a></li>
+                                                
+                                                <li id="darklyTheme" style="background: #375A7F; border-radius: 5px; margin: 5px;"><a style="color: #FFFFFF !important;" href="#">Darkly</a></li>
+                                                
+                                                <li id="slateTheme" style="background: #272B30; border-radius: 5px; margin: 5px;"><a style="color: #C8C8C8 !important;" href="#">Slate</a></li>
+                                            
+                                                <li role="separator" class="divider"></li>
+                                            
+                                                <li id="defaultTheme" style="background: #eb6363; border-radius: 5px; margin: 5px;"><a style="color: #FFFFFF !important;" href="#">Default</a></li>
+                                            
+                                            </ul>
+                                            
+                                        </div>
+                                        
+                                       <!-- <button id="plexTheme" style="background: #E49F0C" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Plex</button>
                                         <button id="embyTheme" style="background: #52B54B" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Emby</button>
                                         <button id="bookTheme" style="background: #3B5998" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Book</button>
                                         <button id="spaTheme" style="background: #66BBAE" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Spa</button>
                                         <button id="darklyTheme" style="background: #375A7F" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Darkly</button>
-                                        <button id="slateTheme" style="background: #272B30" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Slate</button>
+                                        <button id="slateTheme" style="background: #272B30" type="button" class="btn waves btn-dark btn-sm text-uppercase waves-effect waves-float">Slate</button> -->
                                         
                                         <button class="btn waves btn-labeled btn-success btn-sm pull-right text-uppercase waves-effect waves-float" type="submit">
                                                 
@@ -1620,6 +1648,21 @@ endif;
                 changeColor("inactivetext", "#C8C8C8");
                 
             });
+            
+            $('#defaultTheme').on('click touchstart', function(){
+
+                changeColor("topbartext", "#FFFFFF");
+                changeColor("topbar", "#eb6363");
+                changeColor("bottombar", "#eb6363");
+                changeColor("sidebar", "#000000");
+                changeColor("hoverbg", "#eb6363");
+                changeColor("activetabBG", "#eb6363");
+                changeColor("activetabicon", "#FFFFFF");
+                changeColor("activetabtext", "#FFFFFF");
+                changeColor("inactiveicon", "#FFFFFF");
+                changeColor("inactivetext", "#FFFFFF");
+                
+            });
         
         </script>