From 37b29231e47a0c4458dc1c15d98588f16f07e1e2 Mon Sep 17 00:00:00 2001 From: Marius Cramer <m.cramer@pixcept.de> Date: Thu, 06 Aug 2015 03:18:44 -0400 Subject: [PATCH] - don't set password via remoting if field is empty --- interface/web/sites/templates/database_list.htm | 119 ++++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 89 insertions(+), 30 deletions(-) diff --git a/interface/web/sites/templates/database_list.htm b/interface/web/sites/templates/database_list.htm index 1080060..6aeb851 100644 --- a/interface/web/sites/templates/database_list.htm +++ b/interface/web/sites/templates/database_list.htm @@ -1,31 +1,90 @@ -<div class="frmTextHead"><tmpl_var name="list_head_txt"></div><br /> -<input type="button" value="{tmpl_var name="add_new_record_txt"}" class="button" onClick="loadContent('sites/database_edit.php');" /><div class="buttonEnding"></div><br /><br /> -<table width="100%" border="0" cellspacing="0" cellpadding="4" class="listTable"> - <tr> - <td class="tblHead"><tmpl_var name="active_txt"></td> - <td class="tblHead"><tmpl_var name="remote_access_txt"></td> - <td class="tblHead"><tmpl_var name="server_id_txt"></td> - <td class="tblHead"><tmpl_var name="database_name_txt"></td> - <td class="tblHead"> </td> - </tr> - <tr> - <td class="frmText11"><select name="search_active" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_active'}</select></td> - <td class="frmText11"><select name="search_remote_access" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_remote_access'}</select></td> - <td class="frmText11"><select name="search_server_id" onChange="submitForm('pageForm','sites/database_list.php');">{tmpl_var name='search_server_id'}</select></td> - <td class="frmText11"><input type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}" class="text" /></td> - <td class="frmText11" align="right"><input name="Filter" type="button" id="Filter" value="{tmpl_var name="filter_txt"}" class="button" onClick="submitForm('pageForm','sites/database_list.php');"><div class="buttonEnding"></div></td> - </tr> - <tmpl_loop name="records"> - <tr bgcolor="{tmpl_var name="bgcolor"}"> - <td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_active_'}" border="0" /></a></td> - <td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/{tmpl_var name='_remote_access_'}" border="0" /></a></td> - <td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="server_id"}</a></td> - <td class="frmText11"><a href="#" onClick="loadContent('sites/database_edit.php?id={tmpl_var name='id'}');" class="frmText11">{tmpl_var name="database_name"}</a></td> - <td class="frmText11" align="right"><a href="javascript: del_record('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');" class="frmText11"><img src="themes/{tmpl_var name='theme'}/icons/list_icon_delete.png" alt="{tmpl_var name='delete_txt'}" border="0" /></a></td> - </tr> - </tmpl_loop> +<div class='page-header'> + <h1><tmpl_var name="list_head_txt"></h1> +</div> +<p><tmpl_var name="list_desc_txt"></p> - <tr> - <td colspan="5" height="40" align="center" class="tblFooter"><tmpl_var name="paging"></td> - </tr> -</table> \ No newline at end of file + + <tmpl_if name='datalog_changes_count' op='>' value='0'> + <div> + <div class="systemmonitor-state state-info"> + <div class="status"></div> + <div class="statusMsg"> + {tmpl_var name="datalog_changes_txt"} + <ul> + <tmpl_loop name="datalog_changes"> + <li><strong>{tmpl_var name="text"}:</strong> {tmpl_var name="count"}</li> + </tmpl_loop> + </ul> + {tmpl_var name="datalog_changes_end_txt"} + </div> + </div><br /> + </div> + </tmpl_if> + <p class="fieldset-legend">{tmpl_var name="toolsarea_head_txt"}</p> + + <button class="btn btn-default formbutton-success" type="button" data-load-content="sites/database_edit.php">{tmpl_var name="add_new_record_txt"}</button> + + + + + <p class="fieldset-legend"><tmpl_var name="list_head_txt"></p> + <div class="table-wrapper marginTop15"> +<table class="table"> + <thead class="dark form-group-sm"> + <tr> + <th class="tiny-col" data-column="active"><tmpl_var name="active_txt"></th> + <th class="tiny-col" data-column="remote_access"><tmpl_var name="remote_access_txt"></th> + <th data-column="type"><tmpl_var name="type_txt"></th> + <th data-column="server_id"><tmpl_var name="server_id_txt"></th> + <th data-column="parent_domain_id"><tmpl_var name="parent_domain_id_txt"></th> + <th data-column="database_user"><tmpl_var name="database_user_txt"></th> + <th data-column="database_name"><tmpl_var name="database_name_txt"></th> + <th class="small-col text-right">{tmpl_var name='search_limit'}</th> + </tr> + <tr> + <td><select class="form-control" name="search_active">{tmpl_var name='search_active'}</select></td> + <td><select class="form-control" name="search_remote_access">{tmpl_var name='search_remote_access'}</select></td> + <td><select class="form-control" name="search_type">{tmpl_var name='search_type'}</select></td> + <td><select class="form-control" name="search_server_id">{tmpl_var name='search_server_id'}</select></td> + <td><select class="form-control" name="search_parent_domain_id">{tmpl_var name='search_parent_domain_id'}</select></td> + <td><select class="form-control" name="search_database_user_id">{tmpl_var name='search_database_user_id'}</select></td> + <td><input class="form-control" type="text" name="search_database_name" value="{tmpl_var name='search_database_name'}"/></td> + <td class="text-right"> + <button type="button" class="btn btn-default formbutton-default formbutton-narrow" name="Filter" id="Filter" value="{tmpl_var name="filter_txt"}" data-submit-form="pageForm" data-form-action="sites/database_list.php"><span class="icon icon-filter"></span></button> + </td> + </tr> + </thead> + <tbody> + <tmpl_loop name="records"> + <tr> + <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="active"}</a></td> + <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="remote_access"}</a></td> + <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="type"}</a></td> + <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="server_id"}</a></td> + <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="parent_domain_id"}</a></td> + <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_user_id"}</a></td> + <td><a href="#" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}">{tmpl_var name="database_name"}</a></td> + <td class="text-right"> + <tmpl_if name="dblist_phpmyadmin_link"> + <a class="btn btn-default formbutton-default formbutton-narrow" href="sites/database_phpmyadmin.php?id={tmpl_var name='id'}" target="phpmyadmin"><span class="icon icon-dbadmin"></span></a> + </tmpl_if> + <a class="btn btn-default formbutton-default formbutton-narrow" data-load-content="sites/database_edit.php?id={tmpl_var name='id'}"><span class="icon icon-edit"></span></a> + <a class="btn btn-default formbutton-danger formbutton-narrow" href="javascript: ISPConfig.confirm_action('sites/database_del.php?id={tmpl_var name='id'}&phpsessid={tmpl_var name='phpsessid'}','{tmpl_var name='delete_confirmation'}');"><span class="icon icon-delete"></span></a> + </td> + </tr> + </tmpl_loop> + <tmpl_unless name="records"> + <tr class="tbl_row_noresults tbl_row_<tmpl_if name='__EVEN__'}even<tmpl_else>uneven</tmpl_if>"> + <td colspan="8">{tmpl_var name='globalsearch_noresults_text_txt'}</td> + </tr> + </tmpl_unless> + </tbody> + <tfoot> + <tr> + <td colspan="8"><tmpl_var name="paging"></td> + </tr> + </tfoot> + </table> +</div> + + \ No newline at end of file -- Gitblit v1.9.1