commit f96ed52f041ca104d2e07e51f888c0725aaeac88
parent 97d88cff0510a45fe3a715e605ac618ed95dfffd
Author: MTRNord <mtrnord1@gmail.com>
Date: Tue, 30 Dec 2014 23:53:16 +0100
I think php is in this thing better than js
Diffstat:
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/core/backend/admin/user/login/login.php b/core/backend/admin/user/login/login.php
@@ -1,6 +1,19 @@
-<script type="text/javascript">
- function loadquery(){
- var login_module = "modul_g-plus-login";
- $('#login').load("../../core/backend/admin/modules/" + login_module + "/login.php");
- }
-</script>
-\ No newline at end of file
+<?php
+###############################
+# include files from root dir #
+###############################
+$root_1 = realpath($_SERVER["DOCUMENT_ROOT"]);
+$currentdir = getcwd();
+$root_2 = str_replace($root_1, '', $currentdir);
+$root_3 = explode("/", $root_2);
+if ($root_3[1] == 'core') {
+ echo $root_3[1];
+ $root = realpath($_SERVER["DOCUMENT_ROOT"]);
+}else{
+ $root = $root_1 . '/' . $root_3[1];
+}
+
+ $login_module = "modul_g-plus-login";
+ include($root . 'core/backend/admin/modules/'.$login_module. '/login.php');
+
+ ?>
+\ No newline at end of file
diff --git a/themes/jumbotron/index.php b/themes/jumbotron/index.php
@@ -124,9 +124,8 @@ if ($root_3[1] == 'core') {
}
}
</script>
- <?php include($root . '/core/backend/admin/user/login/login.php'); ?>
</head>
- <body onload="loadquery();>
+ <body>
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
<div class="container">
<div class="navbar-header">
@@ -140,8 +139,9 @@ if ($root_3[1] == 'core') {
echo '<a class="navbar-brand" href="index.php">'.$blog_name.'</a>';
?>
</div>
- <div id="navbar" class="navbar-collapse collapse">
- <!--<div id="login"></div>-->
+ <div id="navbar" class="navbar-collapse collapse navbar-right">
+ <form class="navbar-form " role="form" action="../../core/backend/admin/user/login_check.php" method="post">
+ <div id="login"><?php include($root . '/core/backend/admin/user/login/login.php') ?></div>
</div><!--/.navbar-collapse -->
</div>
</nav>
