From d9bcf68e395d6156645a7974b1a992aa6e6c00aa Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 14 Oct 2013 08:57:25 -0400
Subject: [PATCH] Added missing empty directories from svn import
---
interface/web/sites/templates/web_domain_redirect.htm | 130 ++++++++++++++++++++++++++-----------------
1 files changed, 79 insertions(+), 51 deletions(-)
diff --git a/interface/web/sites/templates/web_domain_redirect.htm b/interface/web/sites/templates/web_domain_redirect.htm
index 635a44d..c0bd977 100644
--- a/interface/web/sites/templates/web_domain_redirect.htm
+++ b/interface/web/sites/templates/web_domain_redirect.htm
@@ -1,65 +1,93 @@
<h2><tmpl_var name="list_head_txt"></h2>
<p><tmpl_var name="list_desc_txt"></p>
+<tmpl_if name="config_error_msg">
+<div style="background: #ffdfdf; border: 1px solid #df7d7d; border-width: 1px 0; margin: 1.5em 0 1.5em 0; padding: 7px;">
+ <p style="font-face:bold">{tmpl_var name='configuration_error_txt'}</p>
+ <div>
+ <div style="float:left;width:150px;">{tmpl_var name='config_error_tstamp'} : </div><div style="padding-left:150px;">{tmpl_var name='config_error_msg'}</div>
+ </div>
+</div>
+</tmpl_if>
+
<div class="panel panel_web_domain">
- <div class="pnl_formsarea">
- <fieldset class="inlineLabels">
- <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="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
- <select name="seo_redirect" id="seo_redirect" class="selectInput formLengthHalf">
- {tmpl_var name='seo_redirect'}
- </select>
- </div>
- </fieldset>
+ <div class="pnl_formsarea">
+ <fieldset class="inlineLabels">
+ <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="seo_redirect">{tmpl_var name='seo_redirect_txt'}</label>
+ <select name="seo_redirect" id="seo_redirect" class="selectInput">
+ {tmpl_var name='seo_redirect'}
+ </select>
+ </div>
+ <div class="ctrlHolder nginx">
+ <label for="rewrite_rules">{tmpl_var name='rewrite_rules_txt'}</label>
+ <textarea name="rewrite_rules" id="rewrite_rules" rows='10' cols='50' style="width:400px;">{tmpl_var name='rewrite_rules'}</textarea> <b>{tmpl_var name="allowed_rewrite_rule_directives_txt"}</b><br><br> break<br> if<br> return<br> rewrite<br> set<br><br> <a href="http://wiki.nginx.org/HttpRewriteModule" target="_blank">http://wiki.nginx.org/HttpRewriteModule</a>
+ </div>
+ </fieldset>
- <input type="hidden" name="id" value="{tmpl_var name='id'}">
+ <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_domain_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_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ <div class="buttonHolder buttons">
+ <button class="positive iconstxt icoPositive" type="button" value="{tmpl_var name='btn_save_txt'}" onclick="submitForm('pageForm','sites/web_domain_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_domain_list.php');"><span>{tmpl_var name='btn_cancel_txt'}</span></button>
+ </div>
</div>
- </div>
-
+
</div>
<script language="JavaScript" type="text/javascript">
- var webId = jQuery('input[name="id"]').val();
- var serverId;
- getServerId(webId);
- adjustForm(serverId);
+ var webId = jQuery('input[name="id"]').val();
+ var serverId;
+ 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;
- });
- }
+ 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"]').hide();
- jQuery('#redirect_type option[value="L"]').hide();
- jQuery('#redirect_type option[value="R,L"]').hide();
- 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"]').hide();
- jQuery('#redirect_type option[value="break"]').hide();
- jQuery('#redirect_type option[value="redirect"]').hide();
- jQuery('#redirect_type option[value="permanent"]').hide();
- if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
- }
- });
- }
+ 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();
+ if(selected != "no" && selected != "" && selected != "last" && selected != "break" && selected != "redirect" && selected != "permanent" && selected != "proxy") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ jQuery('.nginx').show();
+ } 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="proxy"]').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="proxy"]').hide();
+ if(selected != "no" && selected != "" && selected != "R" && selected != "L" && selected != "R,L" && selected != "R=301,L") jQuery('#redirect_type option[value="no"]').attr('selected', 'selected');
+ jQuery('.nginx').hide();
+ }
+ });
+ }
</script>
\ No newline at end of file
--
Gitblit v1.9.1