Skip to content
Snippets Groups Projects
Commit a1f121e3 authored by Florian Schaal's avatar Florian Schaal
Browse files

Merge branch 'master' of git.ispconfig.org:florian030/ispconfig3

parents 002688cd c7e1d1b2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.gitignore deleted 100644 → 0
+ 0
− 1
View file @ 002688cd
.DS_Store
interface/web/client/form/reseller.tform.php
+ 3
− 3
View file @ a1f121e3
...@@ -584,7 +584,7 @@ $form["tabs"]['limits'] = array ( ...@@ -584,7 +584,7 @@ $form["tabs"]['limits'] = array (
'value' => '' 'value' => ''
), ),
'mail_servers' => array ( 'mail_servers' => array (
'datatype' => 'INTEGER', 'datatype' => 'VARCHAR',
'formtype' => 'MULTIPLE', 'formtype' => 'MULTIPLE',
'separator' => ',', 'separator' => ',',
'default' => '1', 'default' => '1',
...@@ -1125,7 +1125,7 @@ $form["tabs"]['limits'] = array ( ...@@ -1125,7 +1125,7 @@ $form["tabs"]['limits'] = array (
'value' => '' 'value' => ''
), ),
'dns_servers' => array ( 'dns_servers' => array (
'datatype' => 'INTEGER', 'datatype' => 'VARCHAR',
'formtype' => 'MULTIPLE', 'formtype' => 'MULTIPLE',
'separator' => ',', 'separator' => ',',
'default' => '1', 'default' => '1',
...@@ -1223,7 +1223,7 @@ $form["tabs"]['limits'] = array ( ...@@ -1223,7 +1223,7 @@ $form["tabs"]['limits'] = array (
'value' => '' 'value' => ''
), ),
'db_servers' => array ( 'db_servers' => array (
'datatype' => 'INTEGER', 'datatype' => 'VARCHAR',
'formtype' => 'MULTIPLE', 'formtype' => 'MULTIPLE',
'separator' => ',', 'separator' => ',',
'default' => '1', 'default' => '1',
......
interface/web/sites/templates/user_quota_stats_list.htm
+ 7
− 7
View file @ a1f121e3
...@@ -31,12 +31,12 @@ ...@@ -31,12 +31,12 @@
<tbody> <tbody>
<tmpl_loop name="records"> <tmpl_loop name="records">
<tr> <tr>
<td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td> <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="domain"}</a></td>
<td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="system_user"}</a></td> <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="system_user"}</a></td>
<td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td> <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="used"}</a></td>
<td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="soft"}</a></td> <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="soft"}</a></td>
<td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="hard"}</a></td> <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="hard"}</a></td>
<td><a href="#" data-load-content="sites/web_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="files"}</a></td> <td><a href="#" data-load-content="sites/web_vhost_domain_edit.php?id={tmpl_var name='id'}">{tmpl_var name="files"}</a></td>
<td class="text-right"></td> <td class="text-right"></td>
</tr> </tr>
</tmpl_loop> </tmpl_loop>
...@@ -54,4 +54,4 @@ ...@@ -54,4 +54,4 @@
</table> </table>
</div> </div>
</div> </div>
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment