From c08ab3a456387180b71f7c092aae8f04703d6aa4 Mon Sep 17 00:00:00 2001 From: Dmitriy Simushev <simushevds@ossg.ru> Date: Wed, 3 Sep 2014 15:19:27 +0000 Subject: [PATCH] Use "route" helper in pages style --- .../server_side/_layout.handlebars | 2 +- .../server_side/_menu.handlebars | 32 +++++++++---------- .../templates_src/server_side/bans.handlebars | 12 +++---- .../server_side/button_code.handlebars | 2 +- .../server_side/canned_messages.handlebars | 12 +++---- .../server_side/group_members.handlebars | 4 +-- .../server_side/groups.handlebars | 10 +++--- .../server_side/history.handlebars | 4 +-- .../server_side/history_thread.handlebars | 2 +- .../server_side/history_user.handlebars | 2 +- .../server_side/index.handlebars | 24 +++++++------- .../server_side/install_step.handlebars | 2 +- .../server_side/locales.handlebars | 4 +-- .../server_side/login.handlebars | 4 +-- .../server_side/mail_templates.handlebars | 2 +- .../server_side/operator_avatar.handlebars | 4 +-- .../server_side/operator_groups.handlebars | 2 +- .../operator_permissions.handlebars | 2 +- .../server_side/operators.handlebars | 12 +++---- .../server_side/password_recovery.handlebars | 6 ++-- .../password_recovery_reset.handlebars | 8 ++--- .../server_side/settings_common.handlebars | 2 +- .../server_side/settings_features.handlebars | 2 +- .../settings_performance.handlebars | 2 +- .../server_side/statistics.handlebars | 5 ++- .../server_side/translation_edit.handlebars | 2 +- .../server_side/translation_export.handlebars | 2 +- .../server_side/translation_import.handlebars | 2 +- .../server_side/translations.handlebars | 4 +-- .../server_side/users.handlebars | 2 +- 30 files changed, 87 insertions(+), 88 deletions(-) diff --git a/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars index 921b83d8..87a46fa4 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/_layout.handlebars @@ -26,7 +26,7 @@ {{else}} {{#if show_small_login}} <div id="loginsmallpane"> - <form name="smallLogin" method="post" action="{{mibewRoot}}/operator/login"> + <form name="smallLogin" method="post" action="{{route "login"}}"> {{l10n "Login:"}} <input type="text" name="login" size="8" class="formauth"/> <input type="password" name="password" size="8" class="formauth" autocomplete="off"/> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars index 909b3d44..eec4ce33 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/_menu.handlebars @@ -12,40 +12,40 @@ <li> <h2>{{l10n "Main"}}</h2> <ul class="submenu"> - <li{{#ifEqual menuid "main"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator">{{l10n "Home"}}</a></li> - <li{{#ifEqual menuid "users"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/users">{{l10n "Visitors"}}</a> <span class="small">(<a class="inner" href="{{mibewRoot}}/operator/users?nomenu">{{l10n "without menu"}}</a>)</span></li> - <li{{#ifEqual menuid "history"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/history">{{l10n "Chat history"}}</a></li> + <li{{#ifEqual menuid "main"}} class="active"{{/ifEqual}}><a href="{{route "home_operator"}}">{{l10n "Home"}}</a></li> + <li{{#ifEqual menuid "users"}} class="active"{{/ifEqual}}><a href="{{route "users"}}">{{l10n "Visitors"}}</a> <span class="small">(<a class="inner" href="{{route "users" nomenu="1"}}">{{l10n "without menu"}}</a>)</span></li> + <li{{#ifEqual menuid "history"}} class="active"{{/ifEqual}}><a href="{{route "history"}}">{{l10n "Chat history"}}</a></li> {{#if showstat}} - <li{{#ifEqual menuid "statistics"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/statistics">{{l10n "Statistics"}}</a></li> + <li{{#ifEqual menuid "statistics"}} class="active"{{/ifEqual}}><a href="{{route "statistics"}}">{{l10n "Statistics"}}</a></li> {{/if}} {{#if showban}} - <li{{#ifEqual menuid "bans"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/ban">{{l10n "Blocked visitors"}}</a></li> + <li{{#ifEqual menuid "bans"}} class="active"{{/ifEqual}}><a href="{{route "bans"}}">{{l10n "Blocked visitors"}}</a></li> {{/if}} </ul> </li> <li> <h2>{{l10n "Administration"}}</h2> <ul class="submenu"> - <li{{#ifEqual menuid "canned"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/canned-message">{{l10n "Canned Messages"}}</a></li> + <li{{#ifEqual menuid "canned"}} class="active"{{/ifEqual}}><a href="{{route "canned_messages"}}">{{l10n "Canned Messages"}}</a></li> {{#if showadmin}} - <li{{#ifEqual menuid "getcode"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/button-code">{{l10n "Button code"}}</a></li> - <li{{#ifEqual menuid "operators"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/operator">{{l10n "Operators"}}</a></li> - <li{{#ifEqual menuid "groups"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/group">{{l10n "Groups"}}</a></li> - <li{{#ifEqual menuid "settings"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/settings">{{l10n "Settings"}}</a></li> - <li{{#ifEqual menuid "styles"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/style/page/preview">{{l10n "Styles"}}</a></li> - <li{{#ifEqual menuid "translation"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/translation">{{l10n "Localize"}}</a></li> - <li{{#ifEqual menuid "mail_templates"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/mail-template">{{l10n "Mail templates"}}</a></li> - <li{{#ifEqual menuid "updates"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/updates">{{l10n "Updates"}}</a></li> + <li{{#ifEqual menuid "getcode"}} class="active"{{/ifEqual}}><a href="{{route "button_code"}}">{{l10n "Button code"}}</a></li> + <li{{#ifEqual menuid "operators"}} class="active"{{/ifEqual}}><a href="{{route "operators"}}">{{l10n "Operators"}}</a></li> + <li{{#ifEqual menuid "groups"}} class="active"{{/ifEqual}}><a href="{{route "groups"}}">{{l10n "Groups"}}</a></li> + <li{{#ifEqual menuid "settings"}} class="active"{{/ifEqual}}><a href="{{route "settings_common"}}">{{l10n "Settings"}}</a></li> + <li{{#ifEqual menuid "styles"}} class="active"{{/ifEqual}}><a href="{{route "style_preview" type="page"}}">{{l10n "Styles"}}</a></li> + <li{{#ifEqual menuid "translation"}} class="active"{{/ifEqual}}><a href="{{route "translations"}}">{{l10n "Localize"}}</a></li> + <li{{#ifEqual menuid "mail_templates"}} class="active"{{/ifEqual}}><a href="{{route "mail_templates"}}">{{l10n "Mail templates"}}</a></li> + <li{{#ifEqual menuid "updates"}} class="active"{{/ifEqual}}><a href="{{route "updates"}}">{{l10n "Updates"}}</a></li> {{/if}} {{#if currentopid}} - <li{{#ifEqual menuid "profile"}} class="active"{{/ifEqual}}><a href="{{mibewRoot}}/operator/operator/{{currentopid}}/edit">{{l10n "Profile"}}</a></li> + <li{{#ifEqual menuid "profile"}} class="active"{{/ifEqual}}><a href="{{route "operator_edit" operator_id=currentopid}}">{{l10n "Profile"}}</a></li> {{/if}} </ul> </li> <li> <h2>{{l10n "Other"}}</h2> <ul class="submenu"> - <li><a href="{{mibewRoot}}/operator/logout">{{l10n "Exit"}}</a></li> + <li><a href="{{route "logout"}}">{{l10n "Exit"}}</a></li> </ul> </li> {{/if}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars index fbaf84ce..71a291b7 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/bans.handlebars @@ -27,8 +27,8 @@ <div class="tabletool"> <img src="{{stylePath}}/images/buttons/createban.gif" border="0" alt=""/> - <a href="{{mibewRoot}}/operator/ban/add" title="{{l10n "Add address"}}" - onclick="this.newWindow = window.open('{{mibewRoot}}/operator/ban/add', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{l10n "Add address"}}</a> + <a href="{{route "ban_add"}}" title="{{l10n "Add address"}}" + onclick="this.newWindow = window.open('{{route "ban_add"}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{l10n "Add address"}}</a> </div> <br clear="all"/> @@ -46,7 +46,7 @@ {{#each [pagination.items]}} <tr> <td class="notlast"> - <a href="{{../mibewRoot}}/operator/history?q={{address}}&type=visitor" class="man" id="ti{{banid}}"> + <a href="{{route "history" q=address type="visitor"}}" class="man" id="ti{{banid}}"> {{address}} </a> </td> @@ -56,11 +56,11 @@ <td>{{cutString comment "30"}}</td> <td> - <a class="removelink" id="i{{banid}}" href="{{../mibewRoot}}/operator/ban/{{banid}}/delete?{{csrfTokenInUrl}}"> + <a class="removelink" id="i{{banid}}" href="{{route "ban_delete" ban_id=banid}}?{{csrfTokenInUrl}}"> {{l10n "remove"}} </a>, - <a href="{{../mibewRoot}}/operator/ban/{{banid}}/edit" - onclick="this.newWindow = window.open('{{../mibewRoot}}/operator/ban/{{banid}}/edit', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{l10n "edit"}}</a> + <a href="{{route "ban_edit" ban_id=banid}}/edit" + onclick="this.newWindow = window.open('{{route "ban_edit" ban_id=banid}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{l10n "edit"}}</a> </td> </tr> {{else}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/button_code.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/button_code.handlebars index 1bad34e8..0ed9f583 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/button_code.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/button_code.handlebars @@ -9,7 +9,7 @@ {{> _errors}} - <form name="buttonCodeForm" method="get" action="{{mibewRoot}}/operator/button-code"> + <form name="buttonCodeForm" method="get" action="{{route "button_code"}}"> <div class="mform"> <div class="formtop"> <div class="formtopi"></div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars index a6da357e..b99372e9 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/canned_messages.handlebars @@ -9,7 +9,7 @@ {{> _errors}} - <form name="cannedForm" method="get" action="{{mibewRoot}}/operator/canned-message"> + <form name="cannedForm" method="get" action="{{route "canned_messages"}}"> <div class="mform"> <div class="formtop"> <div class="formtopi"></div> @@ -46,8 +46,8 @@ <div class="tabletool"> <img src="{{stylePath}}/images/buttons/createban.gif" border="0" alt=""/> - <a href="{{mibewRoot}}/operator/canned-message/add?lang={{formlang}}&group={{formgroup}}" target="_blank" - onclick="this.newWindow = window.open('{{mibewRoot}}/operator/canned-message/add?lang={{formlang}}&group={{formgroup}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;"> + <a href="{{route "canned_message_add" lang=formlang group=formgroup}}" target="_blank" + onclick="this.newWindow = window.open('{{route "canned_message_add" lang=formlang group=formgroup}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;"> {{l10n "Add message..."}} </a> </div> @@ -72,9 +72,9 @@ {{#replace "\n" "<br/>"}}{{vcvalue}}{{/replace}} </td> <td> - <a href="{{../mibewRoot}}/operator/canned-message/{{id}}/edit" target="_blank" - onclick="this.newWindow = window.open('{{../mibewRoot}}/operator/canned-message/{{id}}/edit', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{l10n "edit"}}</a>, - <a href="{{../mibewRoot}}/operator/canned-message/{{id}}/delete?lang={{../formlang}}&group={{../formgroup}}&{{csrfTokenInUrl}}">{{l10n "remove"}}</a> + <a href="{{route "canned_message_edit" message_id=id}}" target="_blank" + onclick="this.newWindow = window.open('{{route "canned_message_edit" message_id=id}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{l10n "edit"}}</a>, + <a href="{{route "canned_message_delete" message_id=id lang=../formlang group=../formgroup}}&{{csrfTokenInUrl}}">{{l10n "remove"}}</a> </td> </tr> {{else}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars index 74087745..2b08456a 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/group_members.handlebars @@ -13,7 +13,7 @@ <div id="formmessage">{{l10n "Changes saved"}}</div> {{/if}} - <form name="membersForm" method="post" action="{{mibewRoot}}/operator/group/{{groupid}}/members"> + <form name="membersForm" method="post" action="{{route "group_members_save" group_id=groupid}}"> {{csrfTokenInput}} <div> @@ -31,7 +31,7 @@ <div class="field"> <div class="fvaluenodesc"> <input id="op{{operatorid}}" type="checkbox" name="op{{operatorid}}" value="on"{{#if checked}} checked="checked"{{/if}}/> - <label for="op{{operatorid}}">{{vclocalename}} (<a href="{{../mibewRoot}}/operator/operator/{{operatorid}}/edit">{{vclogin}}</a>)</label> + <label for="op{{operatorid}}">{{vclocalename}} (<a href="{{route "operator_edit" operator_id=operatorid}}/edit">{{vclogin}}</a>)</label> </div> </div> {{/each}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars index 6beb7381..30e69b66 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/groups.handlebars @@ -25,7 +25,7 @@ {{> _errors}} - <form name="groupsForm" method="get" action="{{mibewRoot}}/operator/group"> + <form name="groupsForm" method="get" action="{{route "groups"}}"> <div class="mform"> <div class="formtop"> <div class="formtopi"></div> @@ -63,7 +63,7 @@ {{#if canmodify}} <div class="tabletool"> <img src="{{stylePath}}/images/buttons/createdep.gif" border="0" alt="" /> - <a href="{{mibewRoot}}/operator/group/add" title="{{l10n "Create new group"}}"> + <a href="{{route "group_add"}}" title="{{l10n "Create new group"}}"> {{l10n "Create new group"}} </a> </div> @@ -88,7 +88,7 @@ {{#each groups}} <tr> <td class="notlast level{{level}}"> - <a href="{{../mibewRoot}}/operator/group/{{groupid}}/edit" id="ti{{groupid}}" class="man"> + <a href="{{route "group_edit" group_id=groupid}}" id="ti{{groupid}}" class="man"> {{vclocalname}} </a> </td> @@ -114,7 +114,7 @@ </td> <td> - <a href="{{../mibewRoot}}/operator/group/{{groupid}}/members"> + <a href="{{route "group_members" group_id=groupid}}"> {{inumofagents}} </a> </td> @@ -125,7 +125,7 @@ {{#if ../canmodify}} <td> - <a href="{{../mibewRoot}}/operator/group/{{groupid}}/delete?{{csrfTokenInUrl}}" id="i{{groupid}}" class="removelink"> + <a href="{{route "group_delete" group_id=groupid}}?{{csrfTokenInUrl}}" id="i{{groupid}}" class="removelink"> {{l10n "remove"}} </a> </td> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars index 4cd42d17..d114ceb0 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/history.handlebars @@ -7,7 +7,7 @@ <br /> <br /> - <form name="searchForm" method="get" action="{{mibewRoot}}/operator/history"> + <form name="searchForm" method="get" action="{{route "history"}}"> <div class="mform"> <div class="formtop"> <div class="formtopi"></div> @@ -65,7 +65,7 @@ {{#each [pagination.items]}} <tr> <td> - <a class="man" href="{{../mibewRoot}}/operator/history/thread/{{threadId}}" target="_blank" onclick="this.newWindow = window.open('{{../mibewRoot}}/operator/history/thread/{{threadId}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=720,height=520,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{userName}}</a> + <a class="man" href="{{route "history_thread" thread_id=threadId}}" target="_blank" onclick="this.newWindow = window.open('{{route "history_thread" thread_id=threadId}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=720,height=520,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{userName}}</a> </td> <td> {{{userAddress}}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars index d34be96f..0a29b599 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/history_thread.handlebars @@ -92,7 +92,7 @@ </div> <br /> - <a href="{{mibewRoot}}/operator/history"> + <a href="{{route "history"}}"> {{l10n "Go to search"}} </a> <br /> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars index eea37df2..7da91cc6 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/history_user.handlebars @@ -19,7 +19,7 @@ {{#each [pagination.items]}} <tr> <td> - <a href="{{../mibewRoot}}/operator/history/thread/{{threadId}}" target="_blank" onclick="this.newWindow = window.open('{{../mibewRoot}}/operator/history/thread/{{threadId}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=720,height=520,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{userName}}</a> + <a href="{{route "history_thread" thread_id=threadId}}" target="_blank" onclick="this.newWindow = window.open('{{route "history_thread" thread_id=threadId}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=720,height=520,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{userName}}</a> </td> <td>{{{userAddress}}}</td> <td>{{agentName}}</td> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars index ab45d026..16f0f424 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/index.handlebars @@ -24,7 +24,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/visitors.gif" alt=""/> - <a href="{{mibewRoot}}/operator/users"> + <a href="{{route "users"}}"> {{l10n "Visitors"}} </a> {{l10n "You can find awaiting visitors."}} @@ -34,7 +34,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/history.gif" alt=""/> - <a href="{{mibewRoot}}/operator/history"> + <a href="{{route "history"}}"> {{l10n "Chat history"}} </a> {{l10n "Search the dialogs history."}} @@ -45,7 +45,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/stat.gif" alt=""/> - <a href="{{mibewRoot}}/operator/statistics"> + <a href="{{route "statistics"}}"> {{l10n "Statistics"}} </a> {{l10n "From this page you can generate a variety of usage reports."}} @@ -57,7 +57,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/blocked.gif" alt=""/> - <a href="{{mibewRoot}}/operator/ban"> + <a href="{{route "bans"}}"> {{l10n "Blocked visitors"}} </a> {{l10n "Here you can block malicious visitors."}} @@ -68,7 +68,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/canned.gif" alt=""/> - <a href="{{mibewRoot}}/operator/canned-message"> + <a href="{{route "canned_messages"}}"> {{l10n "Canned Messages"}} </a> {{l10n "Edit messages that you frequently type into the chat."}} @@ -79,7 +79,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/getcode.gif" alt=""/> - <a href="{{mibewRoot}}/operator/button-code"> + <a href="{{route "button_code"}}"> {{l10n "Button code"}} </a> {{l10n "Button HTML code generation."}} @@ -89,7 +89,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/operators.gif" alt=""/> - <a href="{{mibewRoot}}/operator/operator"> + <a href="{{route "operators"}}"> {{l10n "Operators"}} </a> {{l10n "Create or delete company operators. Manage their permissions."}} @@ -99,7 +99,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/dep.gif" alt=""/> - <a href="{{mibewRoot}}/operator/group"> + <a href="{{route "groups"}}"> {{l10n "Groups"}} </a> {{l10n "Department or skill based groups."}} @@ -109,7 +109,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/settings.gif" alt=""/> - <a href="{{mibewRoot}}/operator/settings"> + <a href="{{route "settings_common"}}"> {{l10n "Settings"}} </a> {{l10n "Specify options affecting chat window and common system behavior."}} @@ -121,7 +121,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/profile.gif" alt=""/> - <a href="{{mibewRoot}}/operator/operator/{{currentopid}}/edit"> + <a href="{{route "operator_edit" operator_id=currentopid}}"> {{l10n "Profile"}} </a> {{l10n "You can change your personal information on this page."}} @@ -145,7 +145,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/updates.gif" alt=""/> - <a href="{{mibewRoot}}/operator/updates"> + <a href="{{route "updates"}}"> {{l10n "Updates"}} </a> {{l10n "Check for news and updates."}} @@ -156,7 +156,7 @@ <div class="dashitem"> <div class="dashitem-content"> <img src="{{stylePath}}/images/dash/exit.gif" alt=""/> - <a href="{{mibewRoot}}/operator/logout"> + <a href="{{route "logout"}}"> {{l10n "Exit"}} </a> {{l10n "Log out of the system."}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars index 3266f66e..8a3cec66 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/install_step.handlebars @@ -57,6 +57,6 @@ {{/if}} <br/> - <a href="{{mibewRoot}}/license">{{l10n "Software license agreement"}}</a> + <a href="{{route "license"}}">{{l10n "Software license agreement"}}</a> {{/override}} {{/extends}} \ No newline at end of file diff --git a/src/mibew/styles/pages/default/templates_src/server_side/locales.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/locales.handlebars index 4c979dd3..e4a6ca6a 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/locales.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/locales.handlebars @@ -51,9 +51,9 @@ <td> {{#if isDisabled}} - <a href="{{../mibewRoot}}/operator/locale/{{code}}/enable?{{csrfTokenInUrl}}">{{l10n "enable"}}</a> + <a href="{{route "locale_enable" locale=code}}?{{csrfTokenInUrl}}">{{l10n "enable"}}</a> {{else}} - <a href="{{../mibewRoot}}/operator/locale/{{code}}/disable?{{csrfTokenInUrl}}">{{l10n "disable"}}</a> + <a href="{{route "locale_disable" locale=code}}?{{csrfTokenInUrl}}">{{l10n "disable"}}</a> {{/if}} </td> </tr> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars index 86da7636..1b2f12a1 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/login.handlebars @@ -8,7 +8,7 @@ <p>{{l10n "Mibew Messenger is an open-source live support application."}}</p> </div> - <form name="loginForm" method="post" action="{{mibewRoot}}/operator/login"> + <form name="loginForm" method="post" action="{{route "login_submit"}}"> <div id="loginpane"> <div class="header"> @@ -54,7 +54,7 @@ <input type="submit" name="submit" class="submit-bg-button login-button" value="{{l10n "Enter"}}" /> <div class="links"> - <a href="{{mibewRoot}}/operator/password-recovery">{{l10n "Forgot your password?"}}</a><br/> + <a href="{{route "password_recovery"}}">{{l10n "Forgot your password?"}}</a><br/> </div> </div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/mail_templates.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/mail_templates.handlebars index d005733c..c9f925a4 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/mail_templates.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/mail_templates.handlebars @@ -68,7 +68,7 @@ {{body}} </td> <td> - <a href="{{../mibewRoot}}/operator/mail-template/{{name}}/edit?lang={{../formlang}}">{{l10n "edit"}}</a> + <a href="{{route "mail_template_edit" name=name lang=../formlang}}">{{l10n "edit"}}</a> </td> </tr> {{/each}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operator_avatar.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operator_avatar.handlebars index bf49014a..03e8d691 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/operator_avatar.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/operator_avatar.handlebars @@ -9,7 +9,7 @@ {{> _errors}} - <form name="avatarForm" method="post" action="{{mibewRoot}}/operator/operator/{{opid}}/avatar" enctype="multipart/form-data"> + <form name="avatarForm" method="post" action="{{route "operator_avatar_save" operator_id=opid}}" enctype="multipart/form-data"> {{csrfTokenInput}} <div> @@ -30,7 +30,7 @@ <div class="fvalue"> <img src="{{avatar}}" alt="cannot load avatar"/><br/> {{#if canmodify}} - <a class="formauth" href="{{mibewRoot}}/operator/operator/{{opid}}/avatar/delete?{{csrfTokenInUrl}}"> + <a class="formauth" href="{{route "operator_avatar_delete" operator_id=opid}}?{{csrfTokenInUrl}}"> {{l10n "Remove avatar"}} </a> {{/if}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars index 07c8280e..af2b427d 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/operator_groups.handlebars @@ -13,7 +13,7 @@ <div id="formmessage">{{l10n "Changes saved"}}</div> {{/if}} - <form name="opgroupsForm" method="post" action="{{mibewRoot}}/operator/operator/{{opid}}/groups"> + <form name="opgroupsForm" method="post" action="{{route "operator_groups_save" operator_id=opid}}"> {{csrfTokenInput}} <div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operator_permissions.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operator_permissions.handlebars index 5e4e5efe..0502e61f 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/operator_permissions.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/operator_permissions.handlebars @@ -13,7 +13,7 @@ <div id="formmessage">{{l10n "Changes saved"}}</div> {{/if}} - <form name="permissionsForm" method="post" action="{{mibewRoot}}/operator/operator/{{opid}}/permissions"> + <form name="permissionsForm" method="post" action="{{route "operator_permissions_save" operator_id=opid}}"> {{csrfTokenInput}} <div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars index 80ee4e28..1a92613f 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/operators.handlebars @@ -25,7 +25,7 @@ {{> _errors}} - <form name="agentsForm" method="get" action="{{mibewRoot}}/operator/operator"> + <form name="agentsForm" method="get" action="{{route "operators"}}"> <div class="mform"> <div class="formtop"> <div class="formtopi"></div> @@ -63,7 +63,7 @@ {{#if canmodify}} <div class="tabletool"> <img src="{{stylePath}}/images/buttons/createagent.gif" border="0" alt="" /> - <a href="{{mibewRoot}}/operator/operator/add" title="{{l10n "Add operator..."}}"> + <a href="{{route "operator_add"}}" title="{{l10n "Add operator..."}}"> {{l10n "Add operator..."}} </a> </div> @@ -87,7 +87,7 @@ {{#each allowedAgents}} <tr> <td class="notlast"> - <a id="ti{{operatorid}}" href="{{../mibewRoot}}/operator/operator/{{operatorid}}/edit" class="man"> + <a id="ti{{operatorid}}" href="{{route "operator_edit" operator_id=operatorid}}" class="man"> {{vclogin}} </a> </td> @@ -111,14 +111,14 @@ {{#if ../canmodify}} <td> {{#if isDisabled}} - <a href="{{../mibewRoot}}/operator/operator/{{operatorid}}/enable?{{csrfTokenInUrl}}">{{l10n "enable"}}</a> + <a href="{{route "operator_enable" operator_id=operatorid}}?{{csrfTokenInUrl}}">{{l10n "enable"}}</a> {{else}} - <a href="{{../mibewRoot}}/operator/operator/{{operatorid}}/disable?{{csrfTokenInUrl}}">{{l10n "disable"}}</a> + <a href="{{route "operator_disable" operator_id=operatorid}}?{{csrfTokenInUrl}}">{{l10n "disable"}}</a> {{/if}} </td> <td> - <a class="removelink" id="i{{operatorid}}" href="{{../mibewRoot}}/operator/operator/{{operatorid}}/delete?{{csrfTokenInUrl}}"> + <a class="removelink" id="i{{operatorid}}" href="{{route "operator_delete" operator_id=operatorid}}?{{csrfTokenInUrl}}"> {{l10n "remove"}} </a> </td> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/password_recovery.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/password_recovery.handlebars index dbb647fc..b10046bd 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/password_recovery.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/password_recovery.handlebars @@ -14,11 +14,11 @@ {{l10n "We've sent the instructions to your email. Please check it."}} <br/> <br/> - <a href="{{mibewRoot}}/operator/login">{{l10n "Back to login"}}</a> + <a href="{{route "login"}}">{{l10n "Back to login"}}</a> </div> </div> {{else}} - <form name="restoreForm" method="post" action="{{mibewRoot}}/operator/password-recovery"> + <form name="restoreForm" method="post" action="{{route "password_recovery"}}"> <div id="loginpane"> <div class="header"> @@ -60,7 +60,7 @@ </table> <div class="links"> - <a href="{{mibewRoot}}/operator/login">{{l10n "Back to login"}}</a> + <a href="{{route "login"}}">{{l10n "Back to login"}}</a> </div> </div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/password_recovery_reset.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/password_recovery_reset.handlebars index 3ab424c8..5c5d3d34 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/password_recovery_reset.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/password_recovery_reset.handlebars @@ -14,11 +14,11 @@ {{l10n "Login using your new password."}} <br/> <br/> - <a href="{{mibewRoot}}/operator/login?login={{loginname}}">{{l10n "Proceed to login"}}</a> + <a href="{{route "login" login=loginname}}">{{l10n "Proceed to login"}}</a> </div> </div> {{else}} - <form name="resetForm" method="post" action="{{mibewRoot}}/operator/password-recovery/reset"> + <form name="resetForm" method="post" action="{{route "password_recovery_reset"}}"> <input type="hidden" name="id" value="{{id}}"/> <input type="hidden" name="token" value="{{token}}"/> @@ -75,11 +75,11 @@ </table> <div class="links"> - <a href="{{mibewRoot}}/operator/login">{{l10n "Back to login"}}</a> + <a href="{{route "login"}}">{{l10n "Back to login"}}</a> </div> </div> {{else}} - <a href="{{mibewRoot}}/operator/login">{{l10n "Back to login"}}</a> + <a href="{{route "login"}}">{{l10n "Back to login"}}</a> {{/if}} </div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/settings_common.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/settings_common.handlebars index c77dccad..0e46cc23 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/settings_common.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/settings_common.handlebars @@ -13,7 +13,7 @@ <div id="formmessage">{{l10n "Changes saved"}}</div> {{/if}} - <form name="settings" method="post" action="{{mibewRoot}}/operator/settings"> + <form name="settings" method="post" action="{{route "settings_common_save"}}"> {{csrfTokenInput}} <div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars index b8d3dd6d..63aa3464 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/settings_features.handlebars @@ -18,7 +18,7 @@ <div id="formmessage">{{l10n "Features activated"}}</div> {{/if}} - <form name="features" method="post" action="{{mibewRoot}}/operator/settings/features"> + <form name="features" method="post" action="{{route "settings_features_save"}}"> {{csrfTokenInput}} <input type="hidden" name="sent" value="true"/> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/settings_performance.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/settings_performance.handlebars index fa39ae20..8b9de464 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/settings_performance.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/settings_performance.handlebars @@ -13,7 +13,7 @@ <div id="formmessage">{{l10n "Changes saved"}}</div> {{/if}} - <form name="performance" method="post" action="{{mibewRoot}}/operator/settings/performance"> + <form name="performance" method="post" action="{{route "settings_performance_save"}}"> {{csrfTokenInput}} <div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars index f46c2feb..b086cfce 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/statistics.handlebars @@ -9,8 +9,7 @@ {{> _errors}} - <form name="statisticsForm" method="get" action="{{mibewRoot}}/operator/statistics"> - <input type="hidden" name="type" value="{{type}}" /> + <form name="statisticsForm" method="get" action="{{route "statistics" type=type}}"> {{> _tabs}} @@ -163,7 +162,7 @@ <tbody> {{#each reportByAgent}} <tr> - <td><a href="{{../mibewRoot}}/operator/history?q={{name}}&type=operator">{{name}}</a></td> + <td><a href="{{route "history" q=name type="operator"}}">{{name}}</a></td> <td>{{threads}}</td> <td>{{msgs}}</td> <td>{{avglen}}</td> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translation_edit.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translation_edit.handlebars index 49e2a1d6..8edba94b 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/translation_edit.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/translation_edit.handlebars @@ -17,7 +17,7 @@ {{> _errors}} - <form name="translateForm" method="post" action="{{mibewRoot}}/operator/translation/{{key}}/edit"> + <form name="translateForm" method="post" action="{{route "translation_edit_save" string_id=key}}"> {{csrfTokenInput}} <div class="mform"> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translation_export.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translation_export.handlebars index afe09ff4..4ed70eac 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/translation_export.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/translation_export.handlebars @@ -9,7 +9,7 @@ {{> _errors}} - <form method="post" action="{{mibewRoot}}/operator/translation/export"> + <form method="post" action="{{route "translation_export_process"}}"> {{csrfTokenInput}} <div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translation_import.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translation_import.handlebars index 8cc4c6da..5aadf8b2 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/translation_import.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/translation_import.handlebars @@ -13,7 +13,7 @@ <div id="formmessage">{{l10n "Translation imported"}}</div> {{/if}} - <form method="post" action="{{mibewRoot}}/operator/translation/import" enctype="multipart/form-data"> + <form method="post" action="{{route "translation_import_process"}}" enctype="multipart/form-data"> {{csrfTokenInput}} <div> diff --git a/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars index a3747b2e..c2abfbf9 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/translations.handlebars @@ -7,7 +7,7 @@ <br /> <br /> - <form name="translateForm" method="get" action="{{mibewRoot}}/operator/translation"> + <form name="translateForm" method="get" action="{{route "translations"}}"> {{> _tabs}} <div class="mform"> @@ -66,7 +66,7 @@ {{{source}}} </td> <td> - <a href="{{../mibewRoot}}/operator/translation/{{id}}/edit" target="_blank" onclick="this.newWindow = window.open('{{../mibewRoot}}/operator/translation/{{id}}/edit', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{{translation}}}</a> + <a href="{{route "translation_edit" string_id=id}}" target="_blank" onclick="this.newWindow = window.open('{{route "translation_edit" string_id=id}}', '', 'toolbar=0,scrollbars=1,location=0,status=1,menubar=0,width=640,height=480,resizable=1');this.newWindow.focus();this.newWindow.opener=window;return false;">{{{translation}}}</a> </td> </tr> {{else}} diff --git a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars index 519562a8..6bf702ff 100644 --- a/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars +++ b/src/mibew/styles/pages/default/templates_src/server_side/users.handlebars @@ -80,7 +80,7 @@ jQuery(document).ready(function(){ Mibew.Application.start({ server: { - url: "{{mibewRoot}}/operator/users/update", + url: "{{route "users_update"}}", requestsFrequency: {{frequency}} },