Skip to content
Snippets Groups Projects
Commit c03ae819 authored by Till Brehm's avatar Till Brehm
Browse files

Merge branch 'task/index' into 'stable-3.1'

Do not index and follow

See merge request ispconfig/ispconfig3!953
parents c31dc0f1 080c722a
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<meta name='viewport' content='width=device-width, user-scalable=yes'> <meta name='viewport' content='width=device-width, user-scalable=yes'>
<meta name='description' lang='en' content='' /> <meta name='description' lang='en' content='' />
<meta name='keywords' lang='en' content='' /> <meta name='keywords' lang='en' content='' />
<meta name='robots' content='index, follow' /> <meta name='robots' content='noindex, nofollow' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap.min.css' /> <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/bootstrap.min.css' />
<link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/fonts.min.css' /> <link rel='stylesheet' href='themes/<tmpl_var name='current_theme'>/assets/stylesheets/fonts.min.css' />
...@@ -123,15 +123,15 @@ ...@@ -123,15 +123,15 @@
<script> <script>
<!-- <!--
//$('.ttip').tipsy({live: true, gravity: 'ne', html: true}); //$('.ttip').tipsy({live: true, gravity: 'ne', html: true});
ISPConfig.tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled">'; ISPConfig.tabChangeDiscard = '<tmpl_var name="tabchange_discard_enabled">';
ISPConfig.tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled">'; ISPConfig.tabChangeWarning = '<tmpl_var name="tabchange_warning_enabled">';
ISPConfig.tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">'; ISPConfig.tabChangeWarningTxt = '<tmpl_var name="global_tabchange_warning_txt">';
ISPConfig.tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">'; ISPConfig.tabChangeDiscardTxt = '<tmpl_var name="global_tabchange_discard_txt">';
<tmpl_if name="use_loadindicator" value="y">ISPConfig.setOption('useLoadIndicator', true);</tmpl_if> <tmpl_if name="use_loadindicator" value="y">ISPConfig.setOption('useLoadIndicator', true);</tmpl_if>
<tmpl_if name="use_combobox" value="y">ISPConfig.setOption('useComboBox', true);</tmpl_if> <tmpl_if name="use_combobox" value="y">ISPConfig.setOption('useComboBox', true);</tmpl_if>
$(document).ready(function() { $(document).ready(function() {
$('#globalsearch').ispconfigSearch({ $('#globalsearch').ispconfigSearch({
dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch', dataSrc: '/dashboard/ajax_get_json.php?type=globalsearch',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment