diff --git a/.gitattributes.swp b/.gitattributes.swp new file mode 100644 index 000000000..769f2cbcf Binary files /dev/null and b/.gitattributes.swp differ diff --git a/css/style.css b/css/style.css index 1df49119c..b79667df2 100644 --- a/css/style.css +++ b/css/style.css @@ -5159,7 +5159,7 @@ body .slimScrollDiv { } a, a:hover { - color: #63A8EB; + /*color: #63A8EB;*/ } /*Switcher*/ @@ -5962,7 +5962,7 @@ label { } .gn-menu-main .cs-skin-elastic .cs-options span:hover, .gn-menu-main .cs-skin-elastic .cs-options li.cs-focus span, .gn-menu-main .cs-skin-elastic .cs-options .cs-selected span { - color: #63A8EB; + /*color: #63A8EB;*/ } .gn-menu-main .notifications > a:focus { @@ -5974,7 +5974,7 @@ label { } #menu-toggle:hover span { - background: #fff !important; + /*background: #fff !important;*/ } #menu-toggle span { diff --git a/index.php b/index.php index 6d9ebc536..70abf6236 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,6 @@ setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); $dbTab = $file_db->query('SELECT name FROM sqlite_master WHERE type="table" AND name="tabs"'); -$dbColor = $file_db->query('SELECT name FROM sqlite_master WHERE type="table" AND name="color"'); +$dbOptions = $file_db->query('SELECT name FROM sqlite_master WHERE type="table" AND name="options"'); $tabSetup = "Yes"; -$hasColors = "No"; +$hasOptions = "No"; foreach($dbTab as $row) : @@ -49,11 +49,11 @@ function registration_callback($username, $email, $userdir) endforeach; -foreach($dbColor as $row) : +foreach($dbOptions as $row) : - if (in_array("color", $row)) : + if (in_array("options", $row)) : - $hasColors = "Yes"; + $hasOptions = "Yes"; endif; @@ -62,11 +62,17 @@ function registration_callback($username, $email, $userdir) if($tabSetup == "No") : if($USER->authenticated && $USER->role == "admin") : + $result = $file_db->query('SELECT * FROM tabs WHERE active = "true"'); + elseif($USER->authenticated && $USER->role == "user") : + $result = $file_db->query('SELECT * FROM tabs WHERE active = "true" AND user = "true"'); + else : + $result = $file_db->query('SELECT * FROM tabs WHERE active = "true" AND guest = "true"'); + endif; endif; @@ -79,6 +85,42 @@ function registration_callback($username, $email, $userdir) endif; +if($hasOptions == "Yes") : + + $resulto = $file_db->query('SELECT * FROM options'); + + foreach($resulto as $row) : + + $title = $row['title']; + $topbartext = $row['topbartext']; + $topbar = $row['topbar']; + $bottombar = $row['bottombar']; + $sidebar = $row['sidebar']; + $hoverbg = $row['hoverbg']; + $activetabBG = $row['activetabBG']; + $activetabicon = $row['activetabicon']; + $activetabtext = $row['activetabtext']; + $inactiveicon = $row['inactiveicon']; + $inactivetext = $row['inactivetext']; + + endforeach; + +elseif($hasOptions == "No") : + + $title = "Organizr"; + $topbar = "#eb6363"; + $topbartext = "#FFFFFF"; + $bottombar = "#eb6363"; + $sidebar = "#000000"; + $hoverbg = "#eb6363"; + $activetabBG = "#eb6363"; + $activetabicon = "#FFFFFF"; + $activetabtext = "#FFFFFF"; + $inactiveicon = "#FFFFFF"; + $inactivetext = "#FFFFFF"; + +endif; + ?> @@ -92,7 +134,7 @@ function registration_callback($username, $email, $userdir) -
Lorem ipsum dolor sit amet, consectetur adipisicing elit. Iste, aperiam!
- -Change the colors of the following elements:
+ +