webui fixes

This commit is contained in:
SJ 2012-02-15 11:03:27 +01:00
parent 1e7039c433
commit e51af89e5d
6 changed files with 13 additions and 3 deletions

View File

@ -103,7 +103,8 @@ class ControllerSearchHelper extends Controller {
$this->a['from_domain'] = substr($this->a['from_domain'], 1, strlen($this->a['from_domain'])); $this->a['from_domain'] = substr($this->a['from_domain'], 1, strlen($this->a['from_domain']));
$this->a['to_domain'] = substr($this->a['to_domain'], 1, strlen($this->a['to_domain'])); $this->a['to_domain'] = substr($this->a['to_domain'], 1, strlen($this->a['to_domain']));
$this->a['ref'] = $this->request->post['ref']; if(isset($this->request->post['ref'])) { $this->a['ref'] = $this->request->post['ref']; }
$this->a['sort'] = $this->request->post['sort']; $this->a['sort'] = $this->request->post['sort'];
$this->a['order'] = $this->request->post['order']; $this->a['order'] = $this->request->post['order'];
} }
@ -112,6 +113,8 @@ class ControllerSearchHelper extends Controller {
private function preprocess_post_expert_request($data = array()) { private function preprocess_post_expert_request($data = array()) {
$token = ''; $token = '';
if(!isset($data['search'])) { return; }
$s = preg_replace("/:/", ": ", $data['search']); $s = preg_replace("/:/", ": ", $data['search']);
$s = preg_replace("/,/", " ", $s); $s = preg_replace("/,/", " ", $s);
$s = preg_replace("/\s{1,}/", " ", $s); $s = preg_replace("/\s{1,}/", " ", $s);

View File

@ -1,6 +1,8 @@
var attachment_types = ["word", "excel", "powerpoint", "pdf", "compressed", "text", "odf", "vcard", "image", "audio", "video", "flash", "other"]; var attachment_types = ["word", "excel", "powerpoint", "pdf", "compressed", "text", "odf", "vcard", "image", "audio", "video", "flash", "other"];
var count = 0; var count = 0;
var expsrc = 0;
function getXMLHttp() { function getXMLHttp() {
var XMLHttp = null; var XMLHttp = null;

View File

@ -64,6 +64,7 @@
.text { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 408px; } .text { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 408px; }
.ruletext { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 365px; } .ruletext { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 365px; }
.advtext { font: bold 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 280px; } .advtext { font: bold 12px Arial, sans-serif; font-weight: bold; text-align:left; width: 280px; }
.advtextgrey { font: bold 12px Arial, sans-serif; color: #999; font-weight: bold; text-align:left; width: 280px; }
.textregular { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; } .textregular { font: normal 12px Arial, sans-serif; font-weight: bold; text-align:left; }
.row { display: table-row; } .row { display: table-row; }

View File

@ -17,6 +17,7 @@
<script type="text/javascript"> <script type="text/javascript">
var health_worker_url = "<?php print HEALTH_WORKER_URL; ?>"; var health_worker_url = "<?php print HEALTH_WORKER_URL; ?>";
var piler_ui_lang = '<?php if(LANG == 'en') { ?>en-GB<?php } else { print LANG; } ?>';
</script> </script>
</head> </head>

View File

@ -17,6 +17,10 @@
<script type="text/javascript" src="/view/javascript/jquery-ui-1.8.13.custom.min.js"></script> <script type="text/javascript" src="/view/javascript/jquery-ui-1.8.13.custom.min.js"></script>
<script type="text/javascript" src="/view/javascript/jquery.dropdownPlain.js"></script> <script type="text/javascript" src="/view/javascript/jquery.dropdownPlain.js"></script>
<script type="text/javascript">
var piler_ui_lang = '<?php if(LANG == 'en') { ?>en-GB<?php } else { print LANG; } ?>';
</script>
<script type="text/javascript" src="/view/javascript/piler.js"></script> <script type="text/javascript" src="/view/javascript/piler.js"></script>
</head> </head>

View File

@ -12,11 +12,10 @@
</div> </div>
<div id="ss1"> <div id="ss1">
<div class="row"> <div class="row">
<div class="cell1s" style="width: 75px;"><?php print $text_search; ?>: </div> <div class="cell1s" style="width: 75px;"><?php print $text_search; ?>: </div>
<div class="cell2"><input type="text" id="_search" name="_search" class="advtext" style="width: 100%;" value="<?php if(isset($_search)) { print $_search; } ?>" /></div> <div class="cell2"><input type="text" id="_search" name="_search" class="advtext<?php if(!isset($_search)) { ?>grey<?php } ?>" style="width: 100%;" value="<?php if(isset($_search)) { print $_search; } else { print $text_enter_search_terms; ?>" onclick="if(expsrc==0){this.value=''; this.className = 'advtext'; expsrc++;}<?php } ?>" /></div>
</div> </div>
</div> </div>