diff --git a/interface/web/admin/lib/module.conf.php b/interface/web/admin/lib/module.conf.php
index 8e60c74739bcaf98dfca1aaa024577d44e8486cf..b00c86c6cb69d2f4d2b5fc71d921f14f82405dcb 100644
--- a/interface/web/admin/lib/module.conf.php
+++ b/interface/web/admin/lib/module.conf.php
@@ -1,129 +1,128 @@
<?php
-$module["name"] = "admin";
-$module["title"] = "System";
-$module["template"] = "module.tpl.htm";
-$module["startpage"] = "admin/users_list.php";
-$module["tab_width"] = '60';
+global $conf;
+$module['name'] = 'admin';
+$module['title'] = 'System';
+$module['template'] = 'module.tpl.htm';
+$module['startpage'] = 'admin/users_list.php';
+$module['tab_width'] = '60';
-$items[] = array( 'title' => "Add user",
+
+$items[] = array( 'title' => 'Add user',
'target' => 'content',
'link' => 'admin/users_edit.php');
-$items[] = array( 'title' => "Edit user",
+$items[] = array( 'title' => 'Edit user',
'target' => 'content',
'link' => 'admin/users_list.php');
-$module["nav"][] = array( 'title' => 'CP Users',
+$module['nav'][] = array( 'title' => 'CP Users',
'open' => 1,
'items' => $items);
-// aufräumen
+// aufr�umen
unset($items);
-$items[] = array( 'title' => "Add group",
+$items[] = array( 'title' => 'Add group',
'target' => 'content',
'link' => 'admin/groups_edit.php');
-$items[] = array( 'title' => "Edit group",
+$items[] = array( 'title' => 'Edit group',
'target' => 'content',
'link' => 'admin/groups_list.php');
-$module["nav"][] = array( 'title' => 'Groups',
+$module['nav'][] = array( 'title' => 'Groups',
'open' => 1,
'items' => $items);
-// aufräumen
+// aufr�umen
unset($items);
/*
-$items[] = array( 'title' => "Add server",
+$items[] = array( 'title' => 'Add server',
'target' => 'content',
'link' => 'admin/server_edit.php');
*/
-$items[] = array( 'title' => "Edit server",
+$items[] = array( 'title' => 'Edit server',
'target' => 'content',
'link' => 'admin/server_list.php');
/*
-$items[] = array( 'title' => "Add Server IP",
+$items[] = array( 'title' => 'Add Server IP',
'target' => 'content',
'link' => 'admin/server_ip_edit.php');
*/
-$items[] = array( 'title' => "Edit Server IP",
+$items[] = array( 'title' => 'Edit Server IP',
'target' => 'content',
'link' => 'admin/server_ip_list.php');
-$module["nav"][] = array( 'title' => 'Servers',
+$module['nav'][] = array( 'title' => 'Servers',
'open' => 1,
'items' => $items);
-// aufräumen
+// aufr�umen
unset($items);
-$items[] = array( 'title' => "Add user",
+$items[] = array( 'title' => 'Add user',
'target' => 'content',
'link' => 'admin/dbsync_edit.php');
-$items[] = array( 'title' => "Edit user",
+$items[] = array( 'title' => 'Edit user',
'target' => 'content',
'link' => 'admin/dbsync_list.php');
-$items[] = array( 'title' => "Sync. Now",
+$items[] = array( 'title' => 'Sync. Now',
'target' => 'content',
'link' => 'admin/dbsync_cron.php');
-$module["nav"][] = array( 'title' => 'DB Sync.',
+$module['nav'][] = array( 'title' => 'DB Sync.',
'open' => 1,
'items' => $items);
-// aufräumen
+// aufr�umen
unset($items);
/*
-$items[] = array( 'title' => "Add user",
+$items[] = array( 'title' => 'Add user',
'target' => 'content',
'link' => 'admin/filesync_edit.php');
-$items[] = array( 'title' => "Edit user",
+$items[] = array( 'title' => 'Edit user',
'target' => 'content',
'link' => 'admin/filesync_list.php');
-$module["nav"][] = array( 'title' => 'File Sync.',
+$module['nav'][] = array( 'title' => 'File Sync.',
'open' => 1,
'items' => $items);
-// aufräumen
+// aufr�umen
unset($items);
*/
// Getting the admin options from other modules
-$modules = explode(',',$_SESSION["s"]["user"]["modules"]);
+$modules = explode(',',$_SESSION['s']['user']['modules']);
if(is_array($modules)) {
foreach($modules as $mt) {
- if(is_file($mt."/lib/admin.conf.php")) {
+ if(is_file($mt.'/lib/admin.conf.php')) {
$options = array();
- include_once($conf["rootpath"]."/web/".$mt."/lib/admin.conf.php");
+ include_once($conf['rootpath'].'/web/'.$mt.'/lib/admin.conf.php');
if(is_array($options)) {
foreach($options as $opt) {
- $module["nav"][] = $opt;
+ $module['nav'][] = $opt;
}
}
}
}
}
-
-
-
?>
\ No newline at end of file
diff --git a/interface/web/js/scrigo.js b/interface/web/js/scrigo.js
index 797b4a70a9702baa23dbe58c1ed4379dc42c6140..26d270ad9dceda20829fbb1aac825ac6a35af7ea 100644
--- a/interface/web/js/scrigo.js
+++ b/interface/web/js/scrigo.js
@@ -61,7 +61,7 @@ function submitLoginForm(formname) {
var userNameObj = frm.username;
if(userNameObj.value == ''){
userNameObj.focus();
- return;
+ return;q
}
var passwordObj = frm.passwort;
if(passwordObj.value == ''){
@@ -110,9 +110,8 @@ function submitForm(formname,target) {
function loadContent(pagename) {
var pageContentCallback2 = {
success: function(o) {
- alert(o.responseText);
- if(o.responseText.indexOf("HEADER_REDIRECT:") > -1) {
- var parts = o.responseText.split(":");
+ if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
+ var parts = o.responseText.split(':');
loadContent(parts[1]);
} else {
document.getElementById('pageContent').innerHTML = o.responseText;
@@ -132,7 +131,7 @@ function loadInitContent() {
var pageContentCallback = {
success: function(o) {
- if(o.responseText.indexOf("HEADER_REDIRECT:") > -1) {
+ if(o.responseText.indexOf('HEADER_REDIRECT:') > -1) {
var parts = o.responseText.split(":");
loadContent(parts[1]);
} else {
diff --git a/interface/web/login/index.php b/interface/web/login/index.php
index eddb14240a327045d8579d32a5877945587afb95..f1b49e34b56b2ea5826cc12fdb582b77e514cfe8 100644
--- a/interface/web/login/index.php
+++ b/interface/web/login/index.php
@@ -62,7 +62,7 @@ public function render() {
$user = $app->db->toLower($user);
$_SESSION = array();
$_SESSION['s']['user'] = $user;
- $_SESSION['s']['user']['theme'] = $user['app_theme'];
+ $_SESSION['s']['user']['theme'] = isset($user['app_theme']) ? $user['app_theme'] : 'default';
$_SESSION['s']['language'] = $user['language'];
//print_r($_SESSION);
if(is_file($_SESSION['s']['user']['startmodule'].'/lib/module.conf.php')) {
diff --git a/interface/web/login/templates/index.htm b/interface/web/login/templates/index.htm
index ff26d1827d8289fdc879cbdb4104ad5bab0a3d0c..be13fc5251f0b7f4acebae51705fc8a8d1ade560 100644
--- a/interface/web/login/templates/index.htm
+++ b/interface/web/login/templates/index.htm
@@ -1,32 +1,27 @@
-<p> </p>
-<p> </p>
-<p> </p>
-<p> </p>
-<table width="248" border="0" align="center" cellpadding="4" cellspacing="0">
+<div style="margin-top: 100px">
+<table style="width: 248px; margin: 0px auto;" class="table">
<tr>
- <td height="20" colspan="2" class="tblHead">Login</td>
+ <th colspan="2">Login</th>
</tr>
<tmpl_if name="error">
<tr>
- <td height="46" colspan="2"><tmpl_var name="error"></td>
+ <td colspan="2"><tmpl_var name="error"></td>
</tr>
</tmpl_if>
<tr>
- <td width="109" class="frmText11">Username</td>
- <td width="159"><input name="username" type="text" id="username" class="text"></td>
+ <td>Username</td>
+ <td><input name="username" type="text" id="username" class="text"></td>
</tr>
<tr>
- <td class="frmText11">Passwort</td>
+ <td>Password</td>
<td><input name="passwort" type="password" id="passwort" class="text" onkeypress="if (event.keyCode && event.keyCode == 13) {submitLoginForm('pageForm');};"></td>
</tr>
<tr>
<td> </td>
- <td><input type="button" name="submit" id="submit" value=" Login " class="button" onclick="submitLoginForm('pageForm');" ><div class="buttonEnding"></div>
- </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
+ <td><input type="button" name="submit" id="submit" value=" Login " class="button" onclick="submitLoginForm('pageForm');" ><div class="buttonEnding"></div>
+ </td>
</tr>
</table>
<input type="hidden" name="s_mod" value="login" />
<input type="hidden" name="s_pg" value="index" />
+</div>
\ No newline at end of file
diff --git a/interface/web/themes/default/style.css.bak b/interface/web/themes/default/style.css.bak
new file mode 100644
index 0000000000000000000000000000000000000000..d83383d12acbf680af92c6022a460d06e57de1c1
--- /dev/null
+++ b/interface/web/themes/default/style.css.bak
@@ -0,0 +1,294 @@
+.navTopSelected {
+ background-color: #FFFFFF;
+ border-top: 1px solid #BFCBD9;
+ border-right: 1px solid #BFCBD9;
+ border-bottom: 1px none #BFCBD9;
+ border-left: 1px solid #BFCBD9;
+ text-align: center;
+
+
+}
+.navTop {
+ border-top: 1px none #BFCBD9;
+ border-right: 1px none #BFCBD9;
+ border-bottom: 1px solid #BFCBD9;
+ border-left: 1px none #BFCBD9;
+
+}
+.navTopDefault {
+ background-color: #DEE4F2;
+ /*border: 1px solid #FFFFFF;*/
+ border-top: 1px solid #FFFFFF;
+ border-right: 1px none #FFFFFF;
+ border-bottom: 0px none #BFCBD9;
+ border-left: 1px solid #FFFFFF;
+ text-align: center;
+
+
+}
+.mainContent {
+ background-color: #FFFFFF;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-left-style: solid;
+ border-top-color: #BFCBD9;
+ border-right-color: #BFCBD9;
+ border-bottom-color: #BFCBD9;
+ border-left-color: #BFCBD9;
+}
+.txtNavTopDefault {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #496FA8;
+ text-decoration: none;
+}
+.txtNavTopSelected {
+
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #496FA8;
+ text-decoration: none;
+}
+.navLeftHead {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: bold;
+ color: #4E70A7;
+ text-decoration: none;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: solid;
+ border-left-style: none;
+ border-top-color: #999999;
+ border-right-color: #999999;
+ border-bottom-color: #4E70A7;
+ border-left-color: #999999;
+ text-align: left;
+}
+.navLeftItem {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 10px;
+ color: #4E70A7;
+ text-decoration: none;
+ line-height: 15px;
+
+}
+.txtNavTopHelp {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #FFFFFF;
+ text-decoration: none;
+}
+.tblHead {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #496FA8;
+ background-color: #DEE4F2;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-style: solid;
+ border-right-style: none;
+ border-bottom-style: solid;
+ border-left-style: solid;
+ border-top-color: #C0CCDA;
+ border-right-color: #C0CCDA;
+ border-bottom-color: #C0CCDA;
+ border-left-color: #C0CCDA;
+}
+.tblFooter {
+
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ font-weight: normal;
+ color: #666666;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-style: solid;
+ border-right-style: none;
+ border-bottom-style: none;
+ border-left-style: none;
+ border-top-color: #C0CCDA;
+ border-right-color: #999999;
+ border-bottom-color: #999999;
+ border-left-color: #999999;
+}
+.frmText11 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #333333;
+ text-decoration: none;
+
+}
+.frmText11:Hover {
+ text-decoration: underline;
+
+}
+textarea,input.text,select,option{
+ color:#000000;
+ font-family:CourierNew,Courier,monospace;
+ background-color:#FCFCFC;
+ font-size:14px;
+ font-style:normal;
+ font-variant:normal;
+ font-weight:normal;
+ scrollbar-arrow-color:#FFFFFF;
+ scrollbar-track-color:#BFCBD9;
+ scrollbar-face-color:#BFCBD9;
+ scrollbar-base-color:#BFCBD9;
+ scrollbar-3dlight-color:#BFCBD9;
+ border: 1 solid ##BFCBD9;
+ position: relative;
+}
+.frmTextHead {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 18px;
+ color: #496FA8;
+ text-decoration: none;
+
+}
+
+.frmTextSubHead {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-weight: bold;
+ font-size: 12px;
+ color: #496FA8;
+ text-decoration: none;
+
+}
+/*
+.button {
+ border-color : #666699 #666699 #666699 #666699;
+ border-width : 1 1 1 1; color : Black;
+ background-color : #FFFFFF;
+ height : 19px;
+ font-size : 12px;
+}
+*/
+
+.frmTab {
+ border-top: 1px none #999999;
+ border-right: 1px none #999999;
+ border-bottom: 1px solid #C0CCDA;
+ border-left: 1px none #999999;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ line-height: 16px;
+
+}
+.frmTabSelected {
+ background-color: #FFFFFF;
+ border-top: 1px solid #C0CCDA;
+ border-right: 1px solid #C0CCDA;
+ border-bottom: 1px none #999999;
+ border-left: 1px solid #C0CCDA;
+ text-align: center;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ line-height: 16px;
+
+}
+.frmTabDefault {
+ background-color: #DEE4F2;
+ border: 1px solid #C0CCDA;
+ text-align: center;
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ line-height: 16px;
+
+}
+.frmHead {
+
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: bold;
+ color: #666666;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: solid;
+ border-left-style: none;
+ border-top-color: #999999;
+ border-right-color: #999999;
+ border-bottom-color: #999999;
+ border-left-color: #999999;
+}
+.frmSubHead {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #666666;
+ border-top-width: 1px;
+ border-right-width: 1px;
+ border-bottom-width: 1px;
+ border-left-width: 1px;
+ border-top-style: none;
+ border-right-style: none;
+ border-bottom-style: solid;
+ border-left-style: none;
+ border-top-color: #999999;
+ border-right-color: #999999;
+ border-bottom-color: #999999;
+ border-left-color: #999999;
+ font-weight: bold;
+
+}
+.error {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 11px;
+ color: #000000;
+ border: 1px solid #CC0000;
+ text-decoration: none;
+
+}
+INPUT {
+ border: 1px solid #BFCBD9;
+ /*
+ height: 26px;
+ font-size:20px;
+ */
+}
+TEXTAREA {
+ border: 1px solid #BFCBD9;
+}
+
+.button {
+ border: 0;
+ background: #fff url("../../themes/default/images/button_bg.gif") no-repeat;
+ height: 26px;
+ font-size:14px;
+ /* used to catch the buttonEnding */
+ position: relative;
+}
+
+.buttonEnding {
+ position: absolute;
+ display: inline;
+ width: 2px;
+ height: 26px;
+ background: url("../../themes/default/images/button_end.gif") no-repeat;
+}
+
+h2 {
+ font-family: Verdana, Arial, Helvetica, sans-serif;
+ font-size: 16px;
+ font-weight:bold;
+}
+
+