From 2cb1563f63386b35a69e460051aa9b4a2851d104 Mon Sep 17 00:00:00 2001
From: ftimme <ft@falkotimme.com>
Date: Wed, 30 May 2012 07:30:44 -0400
Subject: [PATCH] - Added (clickable) placeholders to client messaging function. - Added check so that the client password isn't inserted into the message (for security reasons).
---
interface/web/sites/templates/web_aliasdomain_edit.htm | 166 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 125 insertions(+), 41 deletions(-)
diff --git a/interface/web/sites/templates/web_aliasdomain_edit.htm b/interface/web/sites/templates/web_aliasdomain_edit.htm
index 2709aab..7591c6f 100644
--- a/interface/web/sites/templates/web_aliasdomain_edit.htm
+++ b/interface/web/sites/templates/web_aliasdomain_edit.htm
@@ -1,41 +1,125 @@
-<h2><tmpl_var name="list_head_txt"></h2>
-
-<div class="panel panel_web_domain">
-
- <div class="pnl_formsarea">
- <fieldset id="wf_area_web_domain"><legend>Domain</legend>
- <span class="wf_oneField">
- <label for="domain" class="wf_preField">{tmpl_var name='domain_txt'}</label>
- <input type="text" id="domain" name="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255">
- </span>
- <span class="wf_oneField">
- <label for="parent_domain_id" class="wf_preField">{tmpl_var name='parent_domain_id_txt'}</label>
- <select id="parent_domain_id" name="parent_domain_id">{tmpl_var name='parent_domain_id'}</select>
- </span>
- <span class="wf_oneField">
- <label for="redirect_type" class="wf_preField">{tmpl_var name='redirect_type_txt'}</label>
- <select id="redirect_type" name="redirect_type">{tmpl_var name='redirect_type'}</select>
- </span>
- <span class="wf_oneField">
- <label for="redirect_path" class="wf_preField">{tmpl_var name='redirect_path_txt'}</label>
- <input type="text" id="redirect_path" name="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255">
- </span>
- <span class="wf_oneField">
- <label for="subdomain" class="wf_preField">{tmpl_var name='subdomain_txt'}</label>
- <select id="subdomain" name="subdomain">{tmpl_var name='subdomain'}</select>
- </span>
- <span class="wf_oneField">
- <label for="active" class="wf_preField">{tmpl_var name='active_txt'}</label>
- <span class="">{tmpl_var name='active'}</span>
- </span>
- </fieldset>
-
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
-
- <div class="wf_actions buttons">
- <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
- <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
- </div>
- </div>
-
-</div>
+<h2><tmpl_var name="list_head_txt"></h2>
+<p><tmpl_var name="list_desc_txt"></p>
+
+<div class="panel panel_web_domain">
+
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <div class="ctrlHolder">
+ <label for="domain">{tmpl_var name='domain_txt'}</label>
+ <tmpl_if name="domain_option">
+ <select name="domain" id="domain" class="selectInput">
+ {tmpl_var name='domain_option'}
+ </select>
+ <tmpl_else>
+ <input name="domain" id="domain" value="{tmpl_var name='domain'}" size="30" maxlength="255" type="text" class="textInput" />
+ </tmpl_if>
+ </div>
+ <div class="ctrlHolder">
+ <label for="parent_domain_id">{tmpl_var name='parent_domain_id_txt'}</label>
+ <select name="parent_domain_id" id="parent_domain_id" class="selectInput">
+ {tmpl_var name='parent_domain_id'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="redirect_type">{tmpl_var name='redirect_type_txt'}</label>
+ <select name="redirect_type" id="redirect_type" class="selectInput formLengthHalf">
+ {tmpl_var name='redirect_type'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <label for="redirect_path">{tmpl_var name='redirect_path_txt'}</label>
+ <input name="redirect_path" id="redirect_path" value="{tmpl_var name='redirect_path'}" size="30" maxlength="255" type="text" class="textInput" />
+ </div>
+ <div class="ctrlHolder">
+ <label for="subdomain">{tmpl_var name='subdomain_txt'}</label>
+ <select name="subdomain" id="subdomain" class="selectInput formLengthHalf">
+ {tmpl_var name='subdomain'}
+ </select>
+ </div>
+ <div class="ctrlHolder">
+ <p class="label">{tmpl_var name='active_txt'}</p>
+ <div class="multiField">
+ {tmpl_var name='active'}
+ </div>
+ </div>
+ </fieldset>
+
+ <input type="hidden" name="id" value="{tmpl_var name='id'}">
+
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onClick="submitForm('pageForm','sites/web_aliasdomain_edit.php');"><span>{tmpl_var name='btn_save_txt'}</span></button>
+ <button class="negative iconstxt icoNegative" type="button" value="{tmpl_var name='btn_cancel_txt'}" onClick="loadContent('sites/web_aliasdomain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
+ </div>
+
+</div>
+<script language="JavaScript" type="text/javascript">
+ var webId = jQuery('#parent_domain_id').val();
+ var serverId;
+ getServerId(webId);
+
+ jQuery('#parent_domain_id').change(function(){
+ webId = $(this).val();
+ getServerId(webId);
+ });
+
+ function getServerId(webId){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {web_id : webId, type : "getserverid"}, function(data) {
+ serverId = data.serverid;
+ adjustForm(serverId);
+ });
+ }
+
+ function adjustForm(serverId){
+ jQuery.getJSON('sites/ajax_get_json.php'+ '?' + Math.round(new Date().getTime()), {server_id : serverId, type : "getservertype"}, function(data) {
+ var selected = jQuery('#redirect_type').val();
+ if(data.servertype == "nginx"){
+ jQuery("#redirect_type option[value='R']").attr('disabled','disabled');
+ jQuery('#redirect_type option[value="L"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="R,L"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="R=301,L"]').attr('disabled','disabled');
+
+ jQuery("#redirect_type option[value='R']").hide();
+ jQuery('#redirect_type option[value="L"]').hide();
+ jQuery('#redirect_type option[value="R,L"]').hide();
+ jQuery('#redirect_type option[value="R=301,L"]').hide();
+
+ jQuery('#redirect_type option[value="last"]').show();
+ jQuery('#redirect_type option[value="break"]').show();
+ jQuery('#redirect_type option[value="redirect"]').show();
+ jQuery('#redirect_type option[value="permanent"]').show();
+
+ jQuery('#redirect_type option[value="last"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="break"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="redirect"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="permanent"]').attr('disabled',false);
+
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ } else {
+ jQuery('#redirect_type option[value="last"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="break"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="redirect"]').attr('disabled','disabled');
+ jQuery('#redirect_type option[value="permanent"]').attr('disabled','disabled');
+
+ jQuery('#redirect_type option[value="last"]').hide();
+ jQuery('#redirect_type option[value="break"]').hide();
+ jQuery('#redirect_type option[value="redirect"]').hide();
+ jQuery('#redirect_type option[value="permanent"]').hide();
+
+ jQuery('#redirect_type option[value="R"]').show();
+ jQuery('#redirect_type option[value="L"]').show();
+ jQuery('#redirect_type option[value="R,L"]').show();
+ jQuery('#redirect_type option[value="R=301,L"]').show();
+
+ jQuery('#redirect_type option[value="R"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="L"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="R,L"]').attr('disabled',false);
+ jQuery('#redirect_type option[value="R=301,L"]').attr('disabled',false);
+
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ }
+ });
+ }
+
+</script>
\ No newline at end of file
--
Gitblit v1.9.1