hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-12 04:23:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor tweaks

Browse Source
This commit is contained in:
Romain Neutron
2013-05-27 23:11:29 +02:00
parent b52e4ee8c0
commit bdfb97f063
4 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/Alchemy/Phrasea/Controller/Admin/Fields.php
View File

@@ -11,6 +11,7 @@
namespace Alchemy\Phrasea\Controller\Admin; namespace Alchemy\Phrasea\Controller\Admin;
use Alchemy\Phrasea\Application as PhraseaApplication;
use Alchemy\Phrasea\Metadata\TagProvider; use Alchemy\Phrasea\Metadata\TagProvider;
use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController; use Alchemy\Phrasea\Vocabulary\Controller as VocabularyController;
use Silex\Application; use Silex\Application;
@@ -140,8 +141,16 @@ class Fields implements ControllerProviderInterface
public function displayApp(Application $app, Request $request, $sbas_id) public function displayApp(Application $app, Request $request, $sbas_id)
{ {
$languages = array();
foreach (PhraseaApplication::getAvailableLanguages() as $code => $language) {
$data = explode('_', $code);
$languages[$data[0]] = $language;
}
return $app['twig']->render('/admin/fields/index.html.twig', array( return $app['twig']->render('/admin/fields/index.html.twig', array(
'sbas_id' => $sbas_id 'sbas_id' => $sbas_id,
'languages' => $languages,
)); ));
} }
@@ -230,7 +239,8 @@ class Fields implements ControllerProviderInterface
'location' => $app->path('admin_fields_show_field', array( 'location' => $app->path('admin_fields_show_field', array(
'sbas_id' => $sbas_id, 'sbas_id' => $sbas_id,
'id' => $field->get_id() 'id' => $field->get_id()
)))); ))
));
} }
public function listFields(Application $app, $sbas_id) { public function listFields(Application $app, $sbas_id) {

2
templates/web/admin/fields/index.html.twig
View File

@@ -21,4 +21,4 @@
</div> </div>
{# bootstrap admin field backbone application #} {# bootstrap admin field backbone application #}
<script type="text/javascript" src="/include/minify/f=/assets/requirejs/require.js,/scripts/apps/admin/fields/main.js"></script> <script type="text/javascript" src="/include/minify/?f=/assets/requirejs/require.js,/scripts/apps/admin/fields/main.js"></script>

12
templates/web/admin/fields/templates.html.twig
View File

@@ -115,7 +115,7 @@
<i class='icon-ok'></i> <i class='icon-ok'></i>
<% } else { %> <% } else { %>
<i class='icon-remove'></i> <i class='icon-remove'></i>
<% } %> {% trans %}Multivalued{% endtrans %} <% } %> {% trans %}Multivalued{% endtrans %}
</td> </td>
</tr> </tr>
</table> </table>
@@ -168,7 +168,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td><label for="separator">{% trans %}Separator{% endtrans %}</label></td> <td><label for="separator">{% trans %}Separator{% endtrans %}</label></td>
<td><input id="separator" type="text" value="<%= field.separator %>" /></td> <td><input id="separator" type="text" value="<%= field.separator %>" /></td>
</tr> </tr>
</table> </table>
@@ -212,11 +212,9 @@
<select id="thumbtitle"> <select id="thumbtitle">
<option value="1" <%= field.thumbtitle == "1" ? "selected" : "" %> >{% trans 'Tous' %}</option> <option value="1" <%= field.thumbtitle == "1" ? "selected" : "" %> >{% trans 'Tous' %}</option>
<option value="0" <%= field.thumbtitle == "0" ? "selected" : "" %> >{% trans 'Aucun' %}</option> <option value="0" <%= field.thumbtitle == "0" ? "selected" : "" %> >{% trans 'Aucun' %}</option>
<option value="fr" <%= field.thumbtitle == "fr" ? "selected" : "" %> >{% trans 'Francais' %}</option> {% for code, language in languages %}
<option value="nl" <%= field.thumbtitle == "nl" ? "selected" : "" %> >{% trans 'Dutch' %}</option> <option value="{{ code }}" <%= field.thumbtitle == "{{ code }}" ? "selected" : "" %> >{{ language}}</option>
<option value="de" <%= field.thumbtitle == "de" ? "selected" : "" %> >{% trans 'Allemand' %}</option> {% endfor %}
<option value="en" <%= field.thumbtitle == "en" ? "selected" : "" %> >{% trans 'Anglais' %}</option>
<option value="ar" <%= field.thumbtitle == "ar" ? "selected" : "" %> >{% trans 'Arabe' %}</option>
</select> </select>
</td> </td>
</tr> </tr>

2
www/scripts/apps/admin/fields/views/modal.js
View File

@@ -49,5 +49,5 @@ define([
} }
}); });
return ModalView; return ModalView;
}); });