ui: enhance language selection

packages/ui-default/templates/components/form.html

@@ -50,6 +50,7 @@
 {% set noAutocomplete = args.noAutocomplete or false %}
 {% set extra_style = args.extra_style or false %}
 {% set extra_class = args.extra_class %}
+{% set extra_attr = args.extra_attr %}
 {% set date = args.date or false %}
 {% set time = args.time or false %}
   class="{{ form_class }}{% if extra_class %} {{ extra_class }}{% endif %}"
@@ -59,6 +60,7 @@
   {% if noAutocomplete %}autocomplete="off"{% endif %}
   {% if date %}data-pick-date{% endif %}
   {% if time %}data-pick-time{% endif %}
+  {% if extra_attr %}{{ extra_attr }}{% endif %}
   {% if extra_style %}style="{{extra_style}}"{% endif %}
 {% endmacro %}
 

packages/ui-default/templates/problem_submit.html

@@ -42,12 +42,32 @@
       </div>
       <div class="section__body">
         <form method="post">
-          {{ form.form_select({
-               label:'Code language',
-               options:model.system.get('lang.texts')|parseYaml,
-               name:'lang',
-               value:handler.user.codeLang
-             }) }}
+          <div class="hasjs--hide">
+            {{ form.form_select({
+                label:'Code language',
+                options:model.setting.SETTINGS_BY_KEY['codeLang'].range,
+                name:'lang',
+                value:handler.user.codeLang
+              }) }}
+          </div>
+          <div class="row nojs--hide">
+            <div class="medium-5 columns form__item end">
+              <label>
+                {{ _('Code language') }}
+                <div name="form_item_lang" class="select-container">
+                  <select id="codelang-main-select" class="select"></select>
+                </div>
+              </label>
+            </div>
+            <div class="medium-5 columns form__item end" style="display: none" id="codelang-sub-container">
+              <label>
+                {{ _('Code language') }}
+                <div name="form_item_lang" class="select-container">
+                  <select id="codelang-sub-select" class="select"></select>
+                </div>
+              </label>
+            </div>
+          </div>
           {{ form.form_textarea({label:'Code', columns:12, name:'code', extra_class:'monospace', autofocus:true}) }}
           <div class="row"><div class="columns">
             <input type="hidden" name="csrfToken" value="{{ handler.csrfToken }}">

packages/ui-default/templates/record_detail.html

@@ -63,7 +63,7 @@
           {% endif %}
           <dt>{{ _('Language') }}</dt>
           <dd>
-            {{ (model.system.get('lang.texts')|parseYaml)[rdoc['lang']] }}
+            {{ model.setting.langs[rdoc.lang].display }}
           </dd>
           <dt>
             {{ _('Submit At') }}

packages/ui-default/templates/record_main_tr.html

@@ -30,6 +30,6 @@
   </td>
   <td class="col--time">{% if rdoc['status'] == STATUS.STATUS_TIME_LIMIT_EXCEEDED or rdoc['status'] == STATUS.STATUS_MEMORY_LIMIT_EXCEEDED or rdoc['status'] == STATUS.STATUS_OUTPUT_LIMIT_EXCEEDED %}&ge;{% endif %}{{ rdoc.time|round|int }}ms</td>
   <td class="col--memory">{% if rdoc['status'] == STATUS.STATUS_TIME_LIMIT_EXCEEDED or rdoc['status'] == STATUS.STATUS_MEMORY_LIMIT_EXCEEDED or rdoc['status'] == STATUS.STATUS_OUTPUT_LIMIT_EXCEEDED %}&ge;{% endif %}{{ size(rdoc.memory, 1024) }}</td>
-  <td class="col--lang">{{ (model.system.get('lang.texts')|parseYaml)[rdoc['lang']] }}</td>
+  <td class="col--lang">{{ model.setting.langs[rdoc['lang']].display }}</td>
   <td class="col--submit-at">{{ datetimeSpan(rdoc['_id'])|safe }}</td>
 </tr>