commit 686f2cf40b098db3ec8f70bc28577aa2503d21e6 parent ca2c85a38947487d9355fa5974282797c2420799 Author: MTRNord <mtrnord1@gmail.com> Date: Sat, 22 Nov 2014 20:33:17 +0100 Updated Theme changing and install script Diffstat:
19 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/.htaccess b/.htaccess @@ -1,4 +1,3 @@ -Header set Cache-Control "no-cache, must-revalidate, no-store" RewriteEngine on RewriteBase / RewriteCond %{REQUEST_FILENAME} !-f diff --git a/core/libs/theme_engine/config.json b/core/libs/theme_engine/BootStrap/config.json diff --git a/core/libs/theme_engine/css/bootstrap-theme.css b/core/libs/theme_engine/BootStrap/css/bootstrap-theme.css diff --git a/core/libs/theme_engine/css/bootstrap-theme.css.map b/core/libs/theme_engine/BootStrap/css/bootstrap-theme.css.map diff --git a/core/libs/theme_engine/css/bootstrap-theme.min.css b/core/libs/theme_engine/BootStrap/css/bootstrap-theme.min.css diff --git a/core/libs/theme_engine/css/bootstrap.css b/core/libs/theme_engine/BootStrap/css/bootstrap.css diff --git a/core/libs/theme_engine/css/bootstrap.css.map b/core/libs/theme_engine/BootStrap/css/bootstrap.css.map diff --git a/core/libs/theme_engine/css/bootstrap.min.css b/core/libs/theme_engine/BootStrap/css/bootstrap.min.css diff --git a/core/libs/theme_engine/fonts/glyphicons-halflings-regular.eot b/core/libs/theme_engine/BootStrap/fonts/glyphicons-halflings-regular.eot Binary files differ. diff --git a/core/libs/theme_engine/fonts/glyphicons-halflings-regular.svg b/core/libs/theme_engine/BootStrap/fonts/glyphicons-halflings-regular.svg diff --git a/core/libs/theme_engine/fonts/glyphicons-halflings-regular.ttf b/core/libs/theme_engine/BootStrap/fonts/glyphicons-halflings-regular.ttf Binary files differ. diff --git a/core/libs/theme_engine/fonts/glyphicons-halflings-regular.woff b/core/libs/theme_engine/BootStrap/fonts/glyphicons-halflings-regular.woff Binary files differ. diff --git a/core/libs/theme_engine/js/bootstrap.js b/core/libs/theme_engine/BootStrap/js/bootstrap.js diff --git a/core/libs/theme_engine/js/bootstrap.min.js b/core/libs/theme_engine/BootStrap/js/bootstrap.min.js diff --git a/core/libs/theme_engine/js/npm.js b/core/libs/theme_engine/BootStrap/js/npm.js diff --git a/index.php b/index.php @@ -13,7 +13,7 @@ if (!file_exists('core/config/connect.db.inc.php')) { header("HTTP/1.1 301 Moved Permanently"); header("Location:themes/$theme"); }else{ - require('core/config/variables.config.php'); + require_once('core/config/variables.config.php'); header("HTTP/1.1 301 Moved Permanently"); header("Location:themes/$theme"); } diff --git a/install/add_tables.php b/install/add_tables.php @@ -38,7 +38,7 @@ $result = mysqli_query($connection, $sql) or die("Anfrage fehlgeschlagen: " . mysql_error()); echo 'Erstellen erfolgreich'; - //header("HTTP/1.1 301 Moved Permanently"); - //header("Location:../"); + header("HTTP/1.1 301 Moved Permanently"); + header("Location:../"); exit; ?> diff --git a/install/generate_configs.php b/install/generate_configs.php @@ -115,6 +115,14 @@ $filename = '../core/config/variables.config.php'; exit; } + $theme = $_POST["theme"]; + $var_str_th = var_export($theme, true); + $var_th = "\$theme = $var_str_th;\n\n"; + if (!fwrite($handle, $var_th)) { + print "Kann in die Datei $filename nicht schreiben"; + exit; + } + print "Fertig, in Datei $filename wurde $var_str_bn geschrieben"; print "</br>"; fclose($handle); diff --git a/install/index.php b/install/index.php @@ -75,16 +75,31 @@ unlink('../core/config/pass.tmp.php') </tr> <tr> <td><p>Admin Username: </p></td> - <td style="text-indent:40px;"><input type="text" name="admin_username" required="required" placeholder="Untertitel" maxlength="255" /></td> + <td style="text-indent:40px;"><input type="text" name="admin_username" required="required" placeholder="Admin Username" maxlength="255" /></td> </tr> <tr> <td><p>Admin Password: </p></td> - <td style="text-indent:40px;"><input type="text" name="admin_password" required="required" placeholder="Schlagwörter" maxlength="50" /></td> + <td style="text-indent:40px;"><input type="text" name="admin_password" required="required" placeholder="Admin Password" maxlength="50" /></td> + </tr> + </table> +<h3>Design</h3> + <table cellpadding="1" cellspacing="4"> + <tr> + <td><p>Theme</p></td> + <td style="text-indent:40px;"> + <select name="theme" size="3"> + <option>accentbox</option> + <option>jumbotron</option> + <option>parkzone</option> + <option>zResponsive</option> + </select> + </td> </tr> <tr> <td colspan="2"><input type="submit" name="send" value="Weiter" /></td> </tr> </table> + </form> </body> </html>
