diff --git a/libraries/webapptask.py b/libraries/webapptask.py index 48bd50b..4652780 100644 --- a/libraries/webapptask.py +++ b/libraries/webapptask.py @@ -23,8 +23,6 @@ class WebAppTask(Task): self.webserver_id=webserver_id - #

Webservers list >> Websites >> Webapps >> Add webapp

- self.links='

{} >> {} >> {} >> {}

'.format(make_url('webservers/servers'), I18n.lang('webservers', 'webservers_list', 'Webservers list'), make_url('webservers/virtualhost/'+str(webserver_id)), I18n.lang('webservers', 'websites', 'Websites')+' - '+arr_vhost['hostname'], make_url('webapps/'+str(self.data['virtualhost_id'])), I18n.lang('webservers', 'webapps', 'Webapps'), make_url('add_new_app/'+str(self.data['virtualhost_id'])), I18n.lang('webservers', 'add_webapp', 'Add webapp')) self.delete_task=False @@ -46,8 +44,6 @@ class WebAppTask(Task): if self.data['path']!='/' and not re.match(r'^/[\w.-]*/$', self.data['path'].strip()): self.logtask.insert({'status':1, 'progress': 100, 'error': 1, 'task_id': self.id, 'server': self.server, 'message': 'Error: format wrong for path, you need this format / or /path/ '+self.data['path']}) return False - - #self.data['url_return']=make_url('webapps/'+str(self.data['virtualhost_id'])) return True diff --git a/settings/config_admin.py b/settings/config_admin.py index b2b5afe..e167196 100644 --- a/settings/config_admin.py +++ b/settings/config_admin.py @@ -5,8 +5,8 @@ from modules.apache.admin import install_apps #modules_admin=[[I18n.lang('admin', 'users_admin', 'User\'s Admin'), 'paramecio.modules.admin.admin.ausers', 'ausers']] -config_admin.append([I18n.lang('webservers', 'webservers_apache_admin', 'Apache Webservers')]) +config_admin.append([_('Apache Webservers')]) -config_admin.append([I18n.lang('webservers', 'webservers_apache', 'Webservers'), 'modules.apache.admin.app', 'admin_app.webservers', '']) +config_admin.append([_('Webservers'), 'modules.apache.admin.app', 'admin_app.webservers', '']) #config_admin.append([I18n.lang('webservers', 'webservers_apache', 'Webservers'), 'modules.apache.admin.languages', 'admin_app.webservers', 'fa-globe']) #config_admin.append([I18n.lang('webservers', 'webservers', 'Webservers'), 'modules.webservers.admin.install_apps', 'admin_app.install_apps', 'fa-globe'])