diff --git a/webui/controller/common/layout-customer.php b/webui/controller/common/layout-customer.php
new file mode 100644
index 00000000..2eda63d7
--- /dev/null
+++ b/webui/controller/common/layout-customer.php
@@ -0,0 +1,26 @@
+data['title'] = $this->document->title;
+
+ $this->template = "common/layout-customer.tpl";
+
+
+ $this->children = array(
+ "common/menu",
+ "common/footer"
+ );
+
+ $this->render();
+
+ }
+
+
+}
+
+
+?>
diff --git a/webui/controller/customer/list.php b/webui/controller/customer/list.php
index bf900f02..7fdbb741 100644
--- a/webui/controller/customer/list.php
+++ b/webui/controller/customer/list.php
@@ -8,7 +8,7 @@ class ControllerCustomerList extends Controller {
$this->id = "content";
$this->template = "customer/list.tpl";
- $this->layout = "common/layout";
+ $this->layout = "common/layout-customer";
$request = Registry::get('request');
@@ -34,12 +34,6 @@ class ControllerCustomerList extends Controller {
if(isset($this->request->get['id'])) { $this->data['id'] = $this->request->get['id']; }
- $this->data['search'] = '';
-
- if(isset($this->request->post['search'])) { $this->data['search'] = $this->request->post['search']; }
- else if(isset($this->request->get['search'])) { $this->data['search'] = $this->request->get['search']; }
-
-
/* check if we are admin */
if(Registry::get('admin_user') == 1) {
@@ -78,7 +72,7 @@ class ControllerCustomerList extends Controller {
$this->data['a'] = $this->model_saas_customer->get($this->data['id']);
}
else {
- $this->data['entries'] = $this->model_saas_customer->search($this->data['search']);
+ $this->data['entries'] = $this->model_saas_customer->get();
}
if ( isset($this->data['errorstring']) ) {
@@ -88,8 +82,7 @@ class ControllerCustomerList extends Controller {
if (isset($this->request->post['branding_url'])) { $this->data['a']['branding_url'] = $this->request->post['branding_url'];}
if (isset($this->request->post['branding_logo'])) { $this->data['a']['branding_logo'] = $this->request->post['branding_logo'];}
if (isset($this->request->post['support_link'])) { $this->data['a']['support_link'] = $this->request->post['support_link'];}
- if (isset($this->request->post['text_colour'])) { $this->data['a']['text_colour'] = $this->request->post['text_colour'];}
- if (isset($this->request->post['background_colour'])) { $this->data['a']['background_colour'] = $this->request->post['background_colour'];}
+ if (isset($this->request->post['colour'])) { $this->data['a']['colour'] = $this->request->post['colour'];}
}
}
@@ -113,13 +106,10 @@ class ControllerCustomerList extends Controller {
$this->error['branding_text'] = $this->data['text_field_required'];
}
// if colour is provided it must be in the format #fcfcfc or #fcf
- if(isset($this->request->post['text_colour']) && strlen($this->request->post['text_colour']) > 0 && !preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $this->request->post['text_colour'])) {
- $this->error['text_colour'] = $this->data['text_field_colour'];
+ if(isset($this->request->post['colour']) && strlen($this->request->post['colour']) > 0 && !preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $this->request->post['colour'])) {
+ $this->error['colour'] = $this->data['text_field_colour'];
}
- if(isset($this->request->post['background_colour']) && strlen($this->request->post['background_colour']) > 0 && !preg_match('/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})$/', $this->request->post['background_colour'])) {
- $this->error['background_colour'] = $this->data['text_field_colour'];
- }
-
+
if (!$this->error) {
return true;
} else {
diff --git a/webui/view/theme/default/templates/common/layout-customer.tpl b/webui/view/theme/default/templates/common/layout-customer.tpl
new file mode 100644
index 00000000..38a79f5d
--- /dev/null
+++ b/webui/view/theme/default/templates/common/layout-customer.tpl
@@ -0,0 +1,67 @@
+
+
+
+
+ <?php print $title; ?> | <?php print SITE_NAME; ?> <?php if(PROVIDED_BY) { print PROVIDED_BY; } ?>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+request->get['route'])) {
+
+ if($this->request->get['route'] == 'health/health') { ?> onload="Piler.load_health(); setInterval('Piler.load_health()', Piler.health_refresh * 1000);"request->get['route'] == 'stat/online') { ?> onload="setInterval('Piler.reload_page()', Piler.health_refresh * 1000);">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+