From 14b8be7e71a011cedb6155908cafa3faead45bb3 Mon Sep 17 00:00:00 2001 From: ftimme Date: Tue, 27 Sep 2011 14:06:38 +0000 Subject: [PATCH] - Replaced SSL Country input field with a select field. --- interface/web/monitor/templates/show_log.htm | 2 +- .../web/monitor/templates/show_sys_state.htm | 2 +- interface/web/sites/form/web_domain.tform.php | 13 + .../web/sites/templates/web_domain_ssl.htm | 8 +- .../default/css/screen/content_ispc.css | 972 +++++++++--------- 5 files changed, 506 insertions(+), 491 deletions(-) diff --git a/interface/web/monitor/templates/show_log.htm b/interface/web/monitor/templates/show_log.htm index 3b7be6d1a..409e31346 100644 --- a/interface/web/monitor/templates/show_log.htm +++ b/interface/web/monitor/templates/show_log.htm @@ -8,7 +8,7 @@
- {tmpl_var name='refresh'}
diff --git a/interface/web/monitor/templates/show_sys_state.htm b/interface/web/monitor/templates/show_sys_state.htm index 994173826..122d8e34f 100644 --- a/interface/web/monitor/templates/show_sys_state.htm +++ b/interface/web/monitor/templates/show_sys_state.htm @@ -8,7 +8,7 @@
- {tmpl_var name='refresh'}
diff --git a/interface/web/sites/form/web_domain.tform.php b/interface/web/sites/form/web_domain.tform.php index 4c6bed4e7..c28083011 100644 --- a/interface/web/sites/form/web_domain.tform.php +++ b/interface/web/sites/form/web_domain.tform.php @@ -331,6 +331,7 @@ $form["tabs"]['ssl'] = array ( 'width' => '30', 'maxlength' => '255' ), + /* 'ssl_country' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', @@ -343,6 +344,18 @@ $form["tabs"]['ssl'] = array ( 'width' => '2', 'maxlength' => '2' ), + */ + 'ssl_country' => array ( + 'datatype' => 'VARCHAR', + 'formtype' => 'SELECT', + 'default' => '', + 'datasource' => array ( 'type' => 'SQL', + 'querystring' => 'SELECT iso,printable_name FROM country ORDER BY printable_name', + 'keyfield'=> 'iso', + 'valuefield'=> 'printable_name' + ), + 'value' => '' + ), 'ssl_domain' => array ( 'datatype' => 'VARCHAR', 'formtype' => 'TEXT', diff --git a/interface/web/sites/templates/web_domain_ssl.htm b/interface/web/sites/templates/web_domain_ssl.htm index e28201547..0e5f6a6c2 100644 --- a/interface/web/sites/templates/web_domain_ssl.htm +++ b/interface/web/sites/templates/web_domain_ssl.htm @@ -21,10 +21,12 @@
-
+
- -
+ +