Delete button removed from "new" forms. Closes #26

This commit is contained in:
Malishev Dmitry 2012-01-09 18:41:56 +03:00
parent 1ee46998fb
commit 2a6e6ab688
2 changed files with 79 additions and 57 deletions

View file

@ -29,9 +29,11 @@ App.HTML.Build.dns_form = function (options, id) {
if (App.Helpers.isEmpty(options)) { if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New dns domain'); tpl.set(':title', 'New dns domain');
tpl.set(':save_button', 'ADD'); tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else { } else {
tpl.set(':title', 'Edit dns domain'); tpl.set(':title', 'Edit dns domain');
tpl.set(':save_button', 'SAVE'); tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
} }
tpl.set(':id', id || ''); tpl.set(':id', id || '');
tpl.set(':DNS_DOMAIN', options.DNS_DOMAIN || ''); tpl.set(':DNS_DOMAIN', options.DNS_DOMAIN || '');
@ -55,9 +57,11 @@ App.HTML.Build.ip_form = function (options, id) {
if (App.Helpers.isEmpty(options)) { if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New ip address'); tpl.set(':title', 'New ip address');
tpl.set(':save_button', 'ADD'); tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else { } else {
tpl.set(':title', 'Edit ip address'); tpl.set(':title', 'Edit ip address');
tpl.set(':save_button', 'SAVE'); tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
} }
tpl.set(':id', id || ''); tpl.set(':id', id || '');
tpl.set(':IP_ADDRESS', options.IP_ADDRESS || ''); tpl.set(':IP_ADDRESS', options.IP_ADDRESS || '');
@ -84,9 +88,11 @@ App.HTML.Build.user_form = function (options, id) {
if (App.Helpers.isEmpty(options)) { if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New user'); tpl.set(':title', 'New user');
tpl.set(':save_button', 'ADD'); tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else { } else {
tpl.set(':title', 'Edit user'); tpl.set(':title', 'Edit user');
tpl.set(':save_button', 'SAVE'); tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
} }
options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER; options = !App.Helpers.isEmpty(options) ? options : App.Empty.USER;
if (in_edit == true) { if (in_edit == true) {
@ -135,9 +141,11 @@ App.HTML.Build.web_domain_form = function (options, id) {
if (App.Helpers.isEmpty(options)) { if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New WEB domain'); tpl.set(':title', 'New WEB domain');
tpl.set(':save_button', 'ADD'); tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else { } else {
tpl.set(':title', 'Edit WEB domain'); tpl.set(':title', 'Edit WEB domain');
tpl.set(':save_button', 'SAVE'); tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
} }
options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN; options = !App.Helpers.isEmpty(options) ? options : App.Empty.WEB_DOMAIN;
if (in_edit == true) { if (in_edit == true) {
@ -180,9 +188,11 @@ App.HTML.Build.db_form = function (options, id) {
if (App.Helpers.isEmpty(options)) { if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New database'); tpl.set(':title', 'New database');
tpl.set(':save_button', 'ADD'); tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else { } else {
tpl.set(':title', 'Edit database "' + options.DB + '"'); tpl.set(':title', 'Edit database "' + options.DB + '"');
tpl.set(':save_button', 'SAVE'); tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
} }
options = !App.Helpers.isEmpty(options) ? options : App.Empty.DB; options = !App.Helpers.isEmpty(options) ? options : App.Empty.DB;
if (in_edit == true) { if (in_edit == true) {
@ -206,9 +216,11 @@ App.HTML.Build.cron_form = function (options, id) {
if (App.Helpers.isEmpty(options)) { if (App.Helpers.isEmpty(options)) {
tpl.set(':title', 'New cron job'); tpl.set(':title', 'New cron job');
tpl.set(':save_button', 'ADD'); tpl.set(':save_button', 'ADD');
tpl.set(':DELETE_ACTION', '');
} else { } else {
tpl.set(':title', 'Edit cron job'); tpl.set(':title', 'Edit cron job');
tpl.set(':save_button', 'SAVE'); tpl.set(':save_button', 'SAVE');
tpl.set(':DELETE_ACTION', App.Templates.get('DELETE_ACTION', 'general').finalize());
} }
options = !App.Helpers.isEmpty(options) ? options : { options = !App.Helpers.isEmpty(options) ? options : {
DAY: '', DAY: '',

View file

@ -35,7 +35,8 @@ App.Templates.html = {
select_option: ['<option ~!:SELECTED~! value="~!:VALUE~!">~!:TEXT~!</option>'], select_option: ['<option ~!:SELECTED~! value="~!:VALUE~!">~!:TEXT~!</option>'],
error_elm: ['<div class="error-box">~!:ERROR~!</div>'], error_elm: ['<div class="error-box">~!:ERROR~!</div>'],
SUSPENDED_TPL_NOT_SUSPENDED : ['<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>'], SUSPENDED_TPL_NOT_SUSPENDED : ['<span class="ip-status-info ip-enabled-status"><span class="ip-status-text">enabled</span></span>'],
SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status"><span class="ip-status-text">suspended</span></span>'] SUSPENDED_TPL_SUSPENDED : ['<span class="ip-status-info ip-suspended-status"><span class="ip-status-text">suspended</span></span>'],
DELETE_ACTION: ['<span class="delete-btn do_action_delete_entry">Delete</span>']
}, },
popup: { popup: {
error: ['<div class="error"><center><h1 style="color: red;">Important: An Error Has Occured.</h1><hr></center>&nbsp;&nbsp;&nbsp;&nbsp;Something went wrong and some of your actions can be not saved in system. Mostly, it happens when you have network connection errors.<br>,&nbsp;&nbsp;&nbsp;&nbsp;However, please notify us about the situation. It would be helpfull if you will write us approximate time the error occured and last actions you were performing. You send your petition on <a href="mail_to">this email: BLABLA</a>,<br><br><center><span style="color: rgb(92, 92, 92);">Sorry for inconvinience. (We recommend you to reload the page)</span></center></div>'], error: ['<div class="error"><center><h1 style="color: red;">Important: An Error Has Occured.</h1><hr></center>&nbsp;&nbsp;&nbsp;&nbsp;Something went wrong and some of your actions can be not saved in system. Mostly, it happens when you have network connection errors.<br>,&nbsp;&nbsp;&nbsp;&nbsp;However, please notify us about the situation. It would be helpfull if you will write us approximate time the error occured and last actions you were performing. You send your petition on <a href="mail_to">this email: BLABLA</a>,<br><br><center><span style="color: rgb(92, 92, 92);">Sorry for inconvinience. (We recommend you to reload the page)</span></center></div>'],
@ -158,7 +159,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\ <div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\ <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\ <span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\ ~!:DELETE_ACTION~!\
</div>\ </div>\
</div>' </div>'
], ],
@ -292,7 +293,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\ <div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\ <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\ <span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\ ~!:DELETE_ACTION~!\
</div>\ </div>\
</div>\ </div>\
'], '],
@ -319,14 +320,14 @@ App.Templates.html = {
<span class="prop-title">netmask:</span>\ <span class="prop-title">netmask:</span>\
<span class="prop-value">~!:NETMASK~!</span>\ <span class="prop-value">~!:NETMASK~!</span>\
</span>\ </span>\
<span class="prop-box">\
<span class="prop-title">interface:</span>\
<span class="prop-value">~!:INTERFACE~!</span>\
</span>\
<span class="prop-box">\ <span class="prop-box">\
<span class="prop-title">name:</span>\ <span class="prop-title">name:</span>\
<span class="prop-value">~!:NAME~!</span>\ <span class="prop-value">~!:NAME~!</span>\
</span>\ </span>\
<span class="prop-box">\
<span class="prop-title">interface:</span>\
<span class="prop-value">~!:INTERFACE~!</span>\
</span>\
</div>\ </div>\
<div class="ip-props-additional">\ <div class="ip-props-additional">\
<span class="prop-box">\ <span class="prop-box">\
@ -340,7 +341,7 @@ App.Templates.html = {
</div>\ </div>\
<div class="ip-props-ext">\ <div class="ip-props-ext">\
<span class="prop-box">\ <span class="prop-box">\
<span class="prop-title">sys users:</span>\ <span class="prop-title">users:</span>\
<span class="prop-value">~!:U_SYS_USERS~!</span>\ <span class="prop-value">~!:U_SYS_USERS~!</span>\
</span>\ </span>\
<span class="prop-box">\ <span class="prop-box">\
@ -446,7 +447,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\ <div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\ <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\ <span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\ ~!:DELETE_ACTION~!\
</div>\ </div>\
</div>'], </div>'],
ENTRY: ['<div class="row user-details-row ~!:SUSPENDED_CLASS~!">\ ENTRY: ['<div class="row user-details-row ~!:SUSPENDED_CLASS~!">\
@ -469,19 +470,13 @@ App.Templates.html = {
<span class="nickname do_action_edit">~!:LOGIN_NAME~!</span>\ <span class="nickname do_action_edit">~!:LOGIN_NAME~!</span>\
<!-- span class="role">(~!:ROLE~!)</span -->\ <!-- span class="role">(~!:ROLE~!)</span -->\
</span>\ </span>\
<span class="prop-box template-box">\ <span class="prop-box user-name">\
<span class="prop-title">package:</span>\ <span class="prop-value">~!:FULLNAME~!</span>\
<span class="prop-value do_action_view_template_info">~!:PACKAGE~!</span>\ </span>\ </div>\
</span>\
</div>\
<div class="user-details-box">\ <div class="user-details-box">\
<span class="prop-box prop-box_group-values cc user-details do_action_login_as">\ <span class="prop-box prop-box_group-values cc user-details do_action_login_as">\
<span class="prop-value login-as do_action_login_as">login as</span>\ <span class="prop-value login-as do_action_login_as">login as</span>\
</span>\ </span>\
<span class="prop-box user-name">\
<span class="prop-title">name:</span>\
<span class="prop-value">~!:FULLNAME~!</span>\
</span>\
<span class="prop-box prop-box_group-values cc user-details">\ <span class="prop-box prop-box_group-values cc user-details">\
<span class="prop-title">email:</span>\ <span class="prop-title">email:</span>\
<span class="group-values">\ <span class="group-values">\
@ -489,6 +484,10 @@ App.Templates.html = {
<span class="prop-value user-reports">(reports ~!:REPORTS_ENABLED~!)</span>\ <span class="prop-value user-reports">(reports ~!:REPORTS_ENABLED~!)</span>\
</span>\ </span>\
</span>\ </span>\
<span class="prop-box template-box">\
<span class="prop-title">package:</span>\
<span class="prop-value do_action_view_template_info">~!:PACKAGE~!</span>\
</span>\
</div>\ </div>\
</div>\ </div>\
<!-- disk usage block -->\ <!-- disk usage block -->\
@ -526,6 +525,10 @@ App.Templates.html = {
</div>\ </div>\
</div>\ </div>\
<div class="props-additional">\ <div class="props-additional">\
<span class="prop-box webdomains-box">\
<span class="prop-title">web domains:</span>\
<span class="prop-value">~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)</span>\
</span>\
<span class="prop-box websl-box">\ <span class="prop-box websl-box">\
<span class="prop-title">web ssl:</span>\ <span class="prop-title">web ssl:</span>\
<span class="prop-value">~!:U_WEB_SSL~! (~!:WEB_SSL~!)</span>\ <span class="prop-value">~!:U_WEB_SSL~! (~!:WEB_SSL~!)</span>\
@ -544,6 +547,37 @@ App.Templates.html = {
<span class="prop-title">databases:</span>\ <span class="prop-title">databases:</span>\
<span class="prop-value">~!:U_DATABASES~! (~!:DATABASES~!)</span>\ <span class="prop-value">~!:U_DATABASES~! (~!:DATABASES~!)</span>\
</span>\ </span>\
<span class="prop-box ip-box">\
<span class="prop-title">Dedicated IP\'s:</span>\
<span class="prop-value">~!:IP_OWNED~!</span>\
</span>\
<span class="prop-box cron-box">\
<span class="prop-title">cron jobs:</span>\
<span class="prop-value">~!:U_CRON_JOBS~!</span>\
</span>\
</div>\
<div class="props-ext">\
<span class="prop-box maildomains-box">\
<span class="prop-title">mail domains:</span>\
<span class="prop-value">~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)</span>\
</span>\
<span class="prop-box mailboxes-box">\
<span class="prop-title">mail accounts:</span>\
<span class="prop-value">~!:MAIL_BOXES~! per domain</span>\
</span>\
<span class="prop-box mailfwds-box">\
<span class="prop-title">mail forwarders:</span>\
<span class="prop-value">~!:MAIL_FORWARDERS~! per domain</span>\
</span>\
<span class="prop-box dnsdomains-box">\
<span class="prop-title">dns domains:</span>\
<span class="prop-value">~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)</span>\
</span>\
<span class="prop-box prop-box_group-values cc ns-list-box">\
<span class="prop-title">name servers:</span>\
<span class="group-values">\
~!:NS~!</span>\
</span>\
<span class="prop-box shell-box">\ <span class="prop-box shell-box">\
<span class="prop-title">shell:</span>\ <span class="prop-title">shell:</span>\
<span class="prop-value">~!:SHELL~!</span>\ <span class="prop-value">~!:SHELL~!</span>\
@ -551,35 +585,7 @@ App.Templates.html = {
<span class="prop-box backups-box">\ <span class="prop-box backups-box">\
<span class="prop-title">backups:</span>\ <span class="prop-title">backups:</span>\
<span class="prop-value">retention ~!:BACKUPS~!</span>\ <span class="prop-value">retention ~!:BACKUPS~!</span>\
</span>\ </span>\ </div>\
</div>\
<div class="props-ext">\
<span class="prop-box mailboxes-box">\
<span class="prop-title">mailboxes:</span>\
<span class="prop-value">~!:U_MAIL_BOXES~! (~!:MAIL_BOXES~!)</span>\
</span>\
<span class="prop-box mailfwds-box">\
<span class="prop-title">mail forwarders:</span>\
<span class="prop-value">~!:U_MAIL_FORWARDERS~! (~!:MAIL_FORWARDERS~!)</span>\
</span>\
<span class="prop-box maildomains-box">\
<span class="prop-title">mail domains:</span>\
<span class="prop-value">~!:U_MAIL_DOMAINS~! (~!:MAIL_DOMAINS~!)</span>\
</span>\
<span class="prop-box webdomains-box">\
<span class="prop-title">web domains:</span>\
<span class="prop-value">~!:U_WEB_DOMAINS~! (~!:WEB_DOMAINS~!)</span>\
</span>\
<span class="prop-box dnsdomains-box">\
<span class="prop-title">dns domains:</span>\
<span class="prop-value">~!:U_DNS_DOMAINS~! (~!:DNS_DOMAINS~!)</span>\
</span>\
<span class="prop-box prop-box_group-values cc ns-list-box">\
<span class="prop-title">ns list:</span>\
<span class="group-values">\
~!:NS~!</span>\
</span>\
</div>\
</div><!-- // .row-details -->\ </div><!-- // .row-details -->\
</div>'] </div>']
}, },
@ -653,23 +659,28 @@ App.Templates.html = {
<span class="generate-pwd do_action_generate_pass">Generate</span>\ <span class="generate-pwd do_action_generate_pass">Generate</span>\
</div>\ </div>\
</div><!-- // stats settings -->\ </div><!-- // stats settings -->\
<!-- div class="form-row cc">\ <div class="form-row cc">\
<label for="#" class="field-label">SSL Support:</label>\ <label for="#" class="field-label">SSL Support:</label>\
<input type="checkbox" name="SSL" class="styled" ~!:ssl_checked~!="" value="~!SSL~!">\ <input type="checkbox" name="SSL" class="styled" ~!:ssl_checked~!="" value="~!SSL~!">\
</div -->\ </div>\
<div class="form-row cc">\ <div class="form-row cc">\
<label for="#" class="field-label">SSL Document Root:</label>\ <label for="#" class="field-label">SSL Document Root:</label>\
<input type="text" name="SSL_HOME" class="text-field" value="~!:SSL_HOME~!">\ <input type="text" name="SSL_HOME" class="text-field" value="~!:SSL_HOME~!">\
</div>\ </div>\
<div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">SSL Crtificate: <span class="remark">(upload file or paste as text)</span></label>\
<span class="ssl-cert-input-dummy">...</span>\
<textarea name="SSL_CRT" class="textarea ssl-cert">~!:SSL_CRT~!</textarea>\
</div>\
<div class="form-row ssl-crtfct-box cc">\ <div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">SSL Certificate Key: <span class="remark">(upload file or paste as text)</span></label>\ <label for="#" class="field-label">SSL Certificate Key: <span class="remark">(upload file or paste as text)</span></label>\
<span class="ssl-key-input-dummy">...</span>\ <span class="ssl-key-input-dummy">...</span>\
<textarea name="SSL_KEY" class="textarea ssl-key">~!:SSL_KEY~!</textarea>\ <textarea name="SSL_KEY" class="textarea ssl-key">~!:SSL_KEY~!</textarea>\
</div>\ </div>\
<div class="form-row ssl-crtfct-box cc">\ <div class="form-row ssl-crtfct-box cc">\
<label for="#" class="field-label">SSL Crtificate: <span class="remark">(upload file or paste as text)</span></label>\ <label for="#" class="field-label">SSL Certificate CA: <span class="remark">(upload file or paste as text)</span></label>\
<span class="ssl-cert-input-dummy">...</span>\ <span class="ssl-key-input-dummy">...</span>\
<textarea name="SSL_CERT" class="textarea ssl-cert">~!:SSL_CERT~!</textarea>\ <textarea name="SSL_CA" class="textarea ssl-key">~!:SSL_CA~!</textarea>\
</div>\ </div>\
</div><!-- // advanced options -->\ </div><!-- // advanced options -->\
</div>\ </div>\
@ -702,7 +713,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\ <div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\ <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\ <span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\ ~!:DELETE_ACTION~!\
</div>\ </div>\
</div>'], </div>'],
ENTRIES_WRAPPER: ['<div class="domains-list items-list">~!:content~!</div>'], ENTRIES_WRAPPER: ['<div class="domains-list items-list">~!:content~!</div>'],
@ -721,7 +732,6 @@ App.Templates.html = {
<div class="row-details cc">\ <div class="row-details cc">\
<div class="names">\ <div class="names">\
<strong class="domain-name primary do_action_edit">~!:DOMAIN~!</strong>\ <strong class="domain-name primary do_action_edit">~!:DOMAIN~!</strong>\
<span class="alias-title">Alias:</span>\
~!:ALIAS~!\ ~!:ALIAS~!\
</div>\ </div>\
<div class="props-main">\ <div class="props-main">\
@ -829,7 +839,7 @@ App.Templates.html = {
</div>\ </div>\
<div class="db-credentials ">\ <div class="db-credentials ">\
<div class="form-row cc user">\ <div class="form-row cc user">\
<label for="#" class="field-label">Username</label>\ <label for="#" class="field-label">Username:</label>\
<input type="text" name="USER" class="text-field" value="~!:USER~!">\ <input type="text" name="USER" class="text-field" value="~!:USER~!">\
</div>\ </div>\
<div class="form-row pwd-box cc psw">\ <div class="form-row pwd-box cc psw">\
@ -849,7 +859,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\ <div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\ <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\ <span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\ ~!:DELETE_ACTION~!\
</div>\ </div>\
</div>'], </div>'],
ENTRY: ['<div class="row db-details-row ~!:SUSPENDED_CLASS~!">\ ENTRY: ['<div class="row db-details-row ~!:SUSPENDED_CLASS~!">\
@ -959,7 +969,7 @@ App.Templates.html = {
<div class="form-row buttons-row cc">\ <div class="form-row buttons-row cc">\
<input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\ <input class="add-entry-btn do_action_save_form" type="submit" value="~!:save_button~!"/>\
<span class="cancel-btn do_action_cancel_form">Cancel</span>\ <span class="cancel-btn do_action_cancel_form">Cancel</span>\
<span class="delete-btn do_action_delete_entry">Delete</span>\ ~!:DELETE_ACTION~!\
</div>\ </div>\
</div>'], </div>'],
ENTRIES_WRAPPER: ['<div class="cron-list">~!:content~!</div>'], ENTRIES_WRAPPER: ['<div class="cron-list">~!:content~!</div>'],