Merge branch 'v0.9' into wheezy

1 files changed, 9 insertions, 1 deletions

diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html
index 695edd758..7101ed7de 100644
--- a/ishtar_common/templates/base.html
+++ b/ishtar_common/templates/base.html
@@ -32,6 +32,14 @@
     {% endblock %}
     <script type='text/javascript'>
     var shortcut_url = '{% url "shortcut-menu" %}';
+    var get_file_url = '{% url "get-file-shortcut" %}';
+    var get_operation_url = '{% url "get-operation-shortcut" %}';
+    var get_contextrecord_url = '{% url "get-contextrecord-shortcut" %}';
+    var get_find_url = '{% url "get-find-shortcut" %}';
+    var activate_all_search_url = '{% url "activate-all-search" %}';
+    var activate_own_search_url = '{% url "activate-own-search" %}';
+    var activate_all_search_msg = "{% trans 'Searches in the shortcut menu deals with all items.' %}";
+    var activate_own_search_msg = "{% trans 'Searches in the shortcut menu deals with only your items.' %}";
     </script>
 </head>
 <body{% if current_theme%} id='{{current_theme}}'{%endif%}>
@@ -50,7 +58,7 @@
                 {% csrf_token %}
                 <label for='language_selector'>{% trans "Lang" %}{% trans ":"%} </label>
                 <select name="language" id='language_selector'>
-                    <option value="">-------</option>
+                    <option value="">----------</option>
                 {% for lang in LANGUAGES %}
                     <option value="{{ lang.0 }}"{% ifequal LANGUAGE_CODE lang.0 %} selected='selected'{% endifequal %}>{{ lang.1 }}</option>
                 {% endfor %}