Parcourir la source

Last Beta For sure

causefx il y a 10 ans
Parent
commit
3e2fff7fc4
6 fichiers modifiés avec 131 ajouts et 46 suppressions
  1. 0 0
      css/tabs.min.css
  2. 4 1
      example.ini.php
  3. 55 36
      index.php
  4. 0 0
      js/tabs.min.js
  5. 72 7
      settings.php
  6. 0 2
      setup.php

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
css/tabs.min.css


+ 4 - 1
example.ini.php

@@ -4,8 +4,10 @@ title = "iCauseFX"
 password = "$2y$10$97IH4rsp6fb.p5KIFfjVH.xZuFtghq5h.cKV4VuKQPhZCQdmJzeMS"
 useicons = "true"
 usemargins = "true"
+bg = "#f2f2f2"
+tabborder = "#cecece"
 tabcoloractive = "#ffffff"
-fontcoloractive = "#F44343"
+fontcoloractive = "#f44343"
 tabshadowactive = "#808080"
 tabcolor = "#ffffff"
 fontcolor = "#000000"
@@ -22,6 +24,7 @@ enabled = "true"
 url = "https://couchpota.to/"
 icon = "fa-film"
 enabled = "true"
+default = "true"
 [Proxy]
 url = "https://www.glype.com/"
 icon = "fa-bug"

+ 55 - 36
index.php

@@ -5,9 +5,18 @@ try {
 } catch(Exception $e) {
     die('<b>Unable to read config.ini.php. Did you rename it from config.ini.php-example?</b><br><br>Error message: ' .$e->getMessage());
 }
-
+$i = 0;
+$ii = 0;
 foreach ($config as $keyname => $section) {
         
+        if(($keyname !== "general" && $section["enabled"]=="true")){ 
+            $i++;
+            if(!empty($section["default"]) && $section["default"]=="true"){
+                $defaulttabuser = "tab$i";
+            }
+            
+        }
+        
         if(!empty($section["useicons"]) && ($section["useicons"]=="true")){ 
             
             $icons = "active";
@@ -38,7 +47,7 @@ foreach ($config as $keyname => $section) {
         if($margins == "active"){
                 
             $marginpx = "10px";
-            $marginborderpx = "1px";
+            $marginborderpx = "0px";
                 
         }else{
                 
@@ -52,6 +61,13 @@ foreach ($config as $keyname => $section) {
             if($icons == "active"){ $listicons = "<span><i class=\"fa ". $section["icon"] ."\"></i></span>"; }
             $loadedlist .= "<li id=\"". $section["url"] ."x\"><a>" . $keyname . " " . $listicons ."</a></li>\n";
             $loadedurls .= "<div class=\"z-nopadding\" data-content-url=\"". $section["url"] ."\" data-content-type=\"iframe\"></div>\n";
+            if(($keyname !== "general" && !empty($section["enabled"]) && $section["enabled"]=="true" && !empty($section["guest"]) && $section["guest"]=="true")){  
+            $ii++;
+            if(!empty($section["default"]) && $section["default"]=="true"){
+                $defaulttabguest = "tab$ii";
+            }
+               
+        }       
                             
         }
         //Full Access
@@ -63,23 +79,27 @@ foreach ($config as $keyname => $section) {
         }
         //General
         if (empty($title)) $title = 'Manage My HTPC';
-        if(($keyname == "general")) { $title = $section["title"]; $tabcoloractive = $section["tabcoloractive"]; $fontcoloractive = $section["fontcoloractive"]; $tabcolor = $section["tabcolor"]; $fontcolor = $section["fontcolor"]; $tabshadowactive = $section["tabshadowactive"]; $tabshadow = $section["tabshadow"]; $cookiepass = $section["password"];}
+        if(($keyname == "general")) { $title = $section["title"]; $tabcoloractive = $section["tabcoloractive"]; $fontcoloractive = $section["fontcoloractive"]; $tabcolor = $section["tabcolor"]; $fontcolor = $section["fontcolor"]; $tabshadowactive = $section["tabshadowactive"]; $tabshadow = $section["tabshadow"]; $cookiepass = $section["password"]; $bg = $section["bg"]; $tabborder  = $section["tabborder"];}
 
 }
-if($_COOKIE["logged"] !== $cookiepass){
-    $lasttablist .= "<li><a>Login" . $guesticons . "</a></li>\n";
-    $lasttaburl .= "<div class=\"z-nopadding\" data-content-url=\"setup.php\" data-content-type=\"iframe\"></div>\n";
-}
+    if($_COOKIE["logged"] !== $cookiepass){
+        $lasttablist .= "<li><a>Login" . $guesticons . "</a></li>\n";
+        $lasttaburl .= "<div class=\"z-nopadding\" data-content-url=\"setup.php\" data-content-type=\"iframe\"></div>\n";
+        $defaulttab = $defaulttabguest;
+    }
 
-if($_COOKIE["logged"] == $cookiepass){
-    $lasttablist .= "<li><a>Settings" . $adminicons . "</a></li>\n";
-    $lasttaburl .= "<div class=\"z-nopadding\" data-content-url=\"setup.php\" data-content-type=\"iframe\"></div>\n";
-}
+    if($_COOKIE["logged"] == $cookiepass){
+        $lasttablist .= "<li><a>Settings" . $adminicons . "</a></li>\n";
+        $lasttaburl .= "<div class=\"z-nopadding\" data-content-url=\"setup.php\" data-content-type=\"iframe\"></div>\n";
+        $defaulttab = $defaulttabuser;
+    }
 
-if(!file_exists('settings.ini.php')){
-    $lasttablist = "<li><a>Setup<span><i class=\"fa fa-spinner\"></i></span></a></li>\n";
-    $lasttaburl = "<div class=\"z-nopadding\" data-content-url=\"setup.php\" data-content-type=\"iframe\"></div>\n";
-}
+    if(!file_exists('settings.ini.php')){
+        $lasttablist = "<li><a>Setup<span><i class=\"fa fa-spinner\"></i></span></a></li>\n";
+        $lasttaburl = "<div class=\"z-nopadding\" data-content-url=\"setup.php\" data-content-type=\"iframe\"></div>\n";
+    }
+
+    if(empty($defaulttab)){ $defaulttab = "tab1";}
 
 ?>
 <!doctype html>
@@ -89,7 +109,11 @@ if(!file_exists('settings.ini.php')){
 
         <title><?=$title;?></title>
         <meta charset="utf-8">
-        <meta name="viewport" content="width = device-width, initial-scale = 1.0" />
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="mobile-web-app-capable" content="yes" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta name="msapplication-tap-highlight" content="no" />
         <link href="css/min.css" rel="stylesheet" />
         <link href="css/tabs.min.css" rel="stylesheet" />
         <script src="js/jquery.min.js"></script>
@@ -103,14 +127,8 @@ if(!file_exists('settings.ini.php')){
     color: <?=$fontcolor;?>; background-color: <?=$tabcolor;?>; text-shadow: 0 1px <?=$tabshadow;?>;
 }
         </style>
-        <style>.z-tabs.mobile {
-    position: absolute;
-    top: 0;
-    bottom: 0;
-    left: 0;
-    right: 0;
-    overflow: overlay;
-}</style>
+        <style>.z-tabs.mobile {position: absolute;top: 0;bottom: 0;left: 0;right: 0;overflow: overlay;}</style>
+        <style>.z-tabs.white > ul, .z-tabs.white > ul > li > a, .z-tabs.white > .z-container {border-color: <?=$tabborder;?>;}</style>
         
         <script>
 
@@ -126,15 +144,16 @@ if(!file_exists('settings.ini.php')){
     
     </head>
 
-    <body style="position: fixed; top: 0; right: 0; bottom: 0; left: 0; background-color: white; 
+    <body style="position: fixed; top: 0; right: 0; bottom: 0; left: 0; background-color: <?=$bg;?>; 
   -webkit-background-size: cover;
   -moz-background-size: cover;
   -o-background-size: cover;
-  background-size: cover;">
+  background-size: cover;
+    overflow: hidden;">
 
-        <span>&nbsp;</span>
+        <!--<span>&nbsp;</span>-->
 
-        <div id="page" style="margin: <?=$marginpx;?>; position: absolute;">
+        <div id="page" style="margin: <?=$marginpx;?>; position: absolute; overflow: hidden;">
 
             <!--Tabs Start-->
             <div id="tabbed-nav">
@@ -147,13 +166,13 @@ if(!file_exists('settings.ini.php')){
                 </ul>
 
                 <!-- Content container -->
-                <style> .z-container { position: fixed; top: 50px; right: 0px; bottom: 0px; left: 0px; margin: <?=$marginpx;?>; } </style>
+                <style> .z-container { position: absolute; top: 50px; right: 0px; bottom: 0px; left: 0px; margin: <?=$marginpx;?>; } </style>
                 <style> .z-tabs .z-container{ margin: <?=$marginpx;?>; border-width: <?=$marginborderpx;?>; } </style>
                 <style> .z-tabs.mobile.top > .z-container {margin-top: <?=$pxmobile;?>;} </style>
                 <style> .z-video{position: absolute; height: 100%; width: 100%;-webkit-overflow-scrolling: touch; overflow: auto;}</style>
-                <!--<style> .z-content-inner{overflow: overlay;}</style>
-                <style> .z-nopadding.z-content{overflow-x: hidden;overflow-y: auto;}</style>-->
-                <div style="top: <?=$px;?>;overflow: auto;">              
+                <style> .z-content-inner{overflow: hidden;}</style>
+                <style> .z-nopadding.z-content{overflow: hidden}</style>
+                <div style="top: <?=$px;?>; overflow: hidden;">              
 
                     <?=$loadedurls;?>
                     <?=$lasttaburl;?>
@@ -169,7 +188,7 @@ if(!file_exists('settings.ini.php')){
             jQuery(document).ready(function ($) {
                 /* jQuery activation and setting options for the tabs*/
                 $("#tabbed-nav").zozoTabs({
-                    defaultTab: "tab1",
+                    defaultTab: "<?=$defaulttab;?>",
                     multiline: true,
                     theme: "white",
                     position: "top-compact",
@@ -177,14 +196,14 @@ if(!file_exists('settings.ini.php')){
                     animation: {
                         easing: "easeInOutExpo",
                         duration: 450,
-                        effects: "slideRight"
+                        effects: "fade"
                     }
                 });
             });
         </script>
-        <script>
+        <!--<script>
             jQuery('iframe','#container').attr('src',url);
-        </script>
+        </script>-->
 
     </body>
     

Fichier diff supprimé car celui-ci est trop grand
+ 0 - 0
js/tabs.min.js


+ 72 - 7
settings.php

@@ -103,6 +103,11 @@ if(array_key_exists('category-0', $_POST) == true){
 
     <head>
 
+        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="mobile-web-app-capable" content="yes" />
+        <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+        <meta name="msapplication-tap-highlight" content="no" />
         <link rel='stylesheet prefetch' href='https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css'>
         <link rel='stylesheet prefetch' href='https://maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css'>
         <!-- Bootstrap -->
@@ -182,9 +187,23 @@ if(array_key_exists('category-0', $_POST) == true){
     <body> 
 
         <form action="?action=write" method="post" name="adminForm" class="form-inline">
+
+            <div class="alert alert-warning">
+                <a href="#" class="close" data-dismiss="alert" aria-label="close">&times;</a>
+                <strong>Tip!</strong> Choose an option from above to change some settings.
+            </div>
+            
+            <div class="btn-group btn-group-justified">
+                <div class="btn-group"><button data-toggle="collapse" data-target="#general" type="button" class="btn btn-primary">General</button></div>
+                <div class="btn-group"><button data-toggle="collapse" data-target="#color" type="button" class="btn btn-primary">Colors</button></div>
+                <div class="btn-group"><button data-toggle="collapse" data-target="#tabs" type="button" class="btn btn-primary">Tabs</button></div>
+                <div class="btn-group"><a href="?action=logout" class="btn btn-warning" role="button">Logout</a></div>
+                <div class="btn-group"><button type="submit" class="btn btn-success">Save</button></div>
+            </div>
             <?php
             foreach ($config as $keyname => $section) {
                 if(($keyname == "general")) {
+                    echo"<div id=\"general\" class=\"collapse\">";
                     echo "<div class=\"form-group clearfix well well-sm\" style=\"padding-bottom: 0px; padding-top: 10px; margin-bottom: 5px;\">";
                     echo "<input type=\"hidden\" name=\"category-0\" class=\"form-control\" value=\"general\">";
                     echo "<span class=\"btn btn-inactive \" type=\"button\"><span class=\"fa fa-cog\"></span></span> ";
@@ -195,11 +214,19 @@ if(array_key_exists('category-0', $_POST) == true){
                     if($section['useicons'] == "true"){echo "<input type=\"checkbox\" name=\"useicons-0\" id=\"useicons-0\" class=\"css-checkbox\" checked> ";}else {echo "<input type=\"checkbox\" name=\"useicons-0\" id=\"useicons-0\" class=\"css-checkbox\"> ";}
                     echo "<label for=\"useicons-0\" class=\"css-label\">Icons</label>  ";
                     if($section['usemargins'] == "true"){echo "<input type=\"checkbox\" name=\"usemargins-0\" id=\"usemargins-0\" class=\"css-checkbox\" checked> ";}else {echo "<input type=\"checkbox\" name=\"usemargins-0\" id=\"usemargins-0\" class=\"css-checkbox\"> ";}
-                    echo "<label for=\"usemargins-0\" class=\"css-label\">Margins</label>  ";
-                    echo "<a href=\"?action=logout\" class=\"btn btn-warning\" style=\"float: right;\" role=\"button\">Logout</a>";
-                    echo "</div>";
+                    echo "<label for=\"usemargins-0\" class=\"css-label\">Margins</label>  </div></div>";
+                    echo"<div id=\"color\" class=\"collapse\">";
                     echo "<div class=\"form-group clearfix well well-sm\" style=\"padding-bottom: 0px;p adding-top: 10px; margin-bottom: 5px;\">";
-                    echo "<span class=\"btn btn-inactive \" type=\"button\"><span class=\"fa fa-paint-brush\"></span></span> ";
+                    echo "<span class=\"btn btn-inactive \" type=\"button\"><span class=\"fa fa-eyedropper\"></span></span> ";
+                    echo "<div style=\"margin-bottom: 8px\" id=\"bg\" class=\"input-group colorpicker-component\"><div class=\"input-group-addon\">Bg</div>";
+                    echo "<input style=\"margin-bottom: 0px\" id=\"bg\" name=\"bg-0\" type=\"text\" data-format=\"hex\" value=\"" . $section["bg"] ."\" class=\"form-control\"/>";
+                    echo "<span class=\"input-group-addon\"><i></i></span>";
+                    echo "</div>  ";
+                    echo "<div style=\"margin-bottom: 8px\" id=\"tabborder\" class=\"input-group colorpicker-component\"><div class=\"input-group-addon\">Tab Border</div>";
+                    echo "<input style=\"margin-bottom: 0px\" id=\"tabborder\" name=\"tabborder-0\" type=\"text\" data-format=\"hex\" value=\"" . $section["tabborder"] ."\" class=\"form-control\"/>";
+                    echo "<span class=\"input-group-addon\"><i></i></span>";
+                    echo "</div>  ";
+                    echo "<br><span class=\"btn btn-inactive \" type=\"button\"><span class=\"fa fa-paint-brush\"></span></span> ";
                     echo "<div style=\"margin-bottom: 8px\" id=\"tabcoloractive\" class=\"input-group colorpicker-component\"><div class=\"input-group-addon\">Tab</div>";
                     echo "<input style=\"margin-bottom: 0px\" id=\"tabcoloractive\" name=\"tabcoloractive-0\" type=\"text\" data-format=\"hex\" value=\"" . $section["tabcoloractive"] ."\" class=\"form-control\"/>";
                     echo "<span class=\"input-group-addon\"><i></i></span>";
@@ -224,11 +251,11 @@ if(array_key_exists('category-0', $_POST) == true){
                     echo "<div style=\"margin-bottom: 8px\" id=\"tabshadow\" class=\"input-group colorpicker-component\"><div class=\"input-group-addon\">Shadow</div>";
                     echo "<input style=\"margin-bottom: 0px\" id=\"fontcolor\" name=\"tabshadow-0\" type=\"text\" data-format=\"hex\" value=\"" . $section["tabshadow"] ."\" class=\"form-control\"/>";
                     echo "<span class=\"input-group-addon\"><i></i></span>";
-                    echo "</div></div> ";
+                    echo "</div></div></div> ";
                 }
             }
             ?>
-
+            <div id="tabs" class="collapse">
             <div id="tagsForm" class="sortable">
 
             <?php
@@ -244,6 +271,8 @@ if(array_key_exists('category-0', $_POST) == true){
                         <div style="margin-bottom: 8px" class="input-group"><div class="input-group-addon">URL</div><input style="margin-bottom: 0px" type="text" name="url-<?=$i;?>" class="form-control" placeholder="url" value="<?=$section['url']?>"></div>
                         <button data-placement="left" data-cols="5" data-rows="5" class="btn btn-default" name="icon-<?=$i;?>" role="iconpicker" data-iconset="fontawesome" data-icon="<?=$section['icon']?>"></button>
                         <?php
+                        if($section['default'] == "true"){echo '<input type="radio" name="default" checked>';}else {echo '<input type="radio" name="default">';}?> <label> Default</label>
+                        <?php
                         if($section['enabled'] == "true"){echo '<input type="checkbox" name="enabled-' . $i .'" id="enabled-' . $keyname . '" class="css-checkbox" checked>';}else {echo '<input type="checkbox" name="enabled-' . $i .'" id="enabled-' . $keyname . '" class="css-checkbox">';}?>      
                         <label for="enabled-<?=$keyname;?>" class="css-label">Enabled</label> 
                         <?php
@@ -263,6 +292,8 @@ if(array_key_exists('category-0', $_POST) == true){
                 <button class="btn btn-primary" id="addScnt" type="button"><span class="fa fa-plus"></span></button> 
                 <button class="btn btn-success" type="submit"> Save Settings </button>
             </div>
+            
+            </div>
 
         </form>
 
@@ -370,6 +401,40 @@ if(array_key_exists('category-0', $_POST) == true){
             });
         </script>
         
+        <script>
+            $(function () {
+                $('#tabborder').colorpicker({
+                    format: "hex",
+                    align: "left",
+                    colorSelectors: {
+                        '#777777': '#777777',
+                        '#337ab7': '#337ab7',
+                        '#5cb85c': '#5cb85c',
+                        '#5bc0de': '#5bc0de',
+                        '#f0ad4e': '#f0ad4e',
+                        '#d9534f': '#d9534f'
+                    }
+                });
+            });
+        </script>
+        
+        <script>
+            $(function () {
+                $('#bg').colorpicker({
+                    format: "hex",
+                    align: "left",
+                    colorSelectors: {
+                        '#777777': '#777777',
+                        '#337ab7': '#337ab7',
+                        '#5cb85c': '#5cb85c',
+                        '#5bc0de': '#5bc0de',
+                        '#f0ad4e': '#f0ad4e',
+                        '#d9534f': '#d9534f'
+                    }
+                });
+            });
+        </script>
+        
         <script type='text/javascript'>
 
         $(function() {
@@ -377,7 +442,7 @@ if(array_key_exists('category-0', $_POST) == true){
             var i = <?=$i?>;
 
             $('#addScnt').on('click', function() {
-                $('<div class="form-group clearfix ui-sortable-handle well well-sm" style="padding-bottom: 0px; padding-top: 10px; margin-bottom: 5px;"> <span class="btn btn-default move" type="button"><span class="fa fa-arrows"></span></span> <div style="margin-bottom: 8px" class="input-group"><div class="input-group-addon">Name</div><input style="margin-bottom: 0px" name="category-' + i +'" class="form-control" placeholder="Tag" value="New Tab"></div> <div style="margin-bottom: 8px" class="input-group"><div class="input-group-addon">URL</div><input style="margin-bottom: 0px" type="text" name="url-' + i +'" class="form-control" placeholder="url" value="Add URL"></div> <button data-placement="left" data-cols="5" data-rows="5" class="btn btn-default iconpicker" name="icon-' + i +'" role="iconpicker" data-iconset="fontawesome" data-icon="fa-question"><i class="fa fa-play-circle-o"></i><input type="hidden" name="icon-' + i +'" value="fa-play-circle-o"><span class="caret"></span></button> <input type="checkbox" name="enabled-' + i +'" id="enabled-' + i +'" class="css-checkbox" checked> <label for="enabled-' + i +'" class="css-label">Enabled</label> <input type="checkbox" name="guest-' + i +'" id="guest-' + i +'" class="css-checkbox"> <label for="guest-' + i +'" class="css-label">Guest</label> <button style="float: right" class="btn btn-danger deleteGroup" id="remScnt" type="button"><span class="fa fa-trash"></span></button></div>').appendTo(scntDiv);
+                $('<div class="form-group clearfix ui-sortable-handle well well-sm" style="padding-bottom: 0px; padding-top: 10px; margin-bottom: 5px;"> <span class="btn btn-default move" type="button"><span class="fa fa-arrows"></span></span> <div style="margin-bottom: 8px" class="input-group"><div class="input-group-addon">Name</div><input style="margin-bottom: 0px" name="category-' + i +'" class="form-control" placeholder="Tag" value="New Tab"></div> <div style="margin-bottom: 8px" class="input-group"><div class="input-group-addon">URL</div><input style="margin-bottom: 0px" type="text" name="url-' + i +'" class="form-control" placeholder="url" value="Add URL"></div> <button data-placement="left" data-cols="5" data-rows="5" class="btn btn-default iconpicker" name="icon-' + i +'" role="iconpicker" data-iconset="fontawesome" data-icon="fa-question"><i class="fa fa-play-circle-o"></i><input type="hidden" name="icon-' + i +'" value="fa-play-circle-o"><span class="caret"></span></button> <input type="radio" name="default"> <label> Default</label><input type="checkbox" name="enabled-' + i +'" id="enabled-' + i +'" class="css-checkbox" checked> <label for="enabled-' + i +'" class="css-label">Enabled</label> <input type="checkbox" name="guest-' + i +'" id="guest-' + i +'" class="css-checkbox"> <label for="guest-' + i +'" class="css-label">Guest</label> <button style="float: right" class="btn btn-danger deleteGroup" id="remScnt" type="button"><span class="fa fa-trash"></span></button></div>').appendTo(scntDiv);
                 i++;    
                 return false;
 

+ 0 - 2
setup.php

@@ -1,7 +1,5 @@
 <?php
 
-//ini_set('display_errors',1);  error_reporting(E_ALL);
-
 $configfile = 'settings.ini.php';
 $examplefile = 'example.ini.php';
 

Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff