hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

Browse Source
This commit is contained in:
Nicolas Le Goff
2012-02-07 12:01:45 +01:00
parent 1b02fedad8 3751d540f0
commit 1f6f81ee93
25 changed files with 3876 additions and 3895 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/login/index.twig
View File

@@ -159,8 +159,8 @@
<table style="border:none;width:100%" cellspacing="0" cellpadding="0">
<tr>
<td style="text-align:left;">
{% trans 'phraseanet:: language' %}
{% trans 'phraseanet:: language' %}
<select name="lng" id="lng-select" onchange="setLanguage();">
{% for code, language in core.getAvailableLanguages() %}
<option value="{{ code }}" {% if code == session.get_locale() %}selected="selected"{% endif %}>
@@ -168,7 +168,7 @@
</option>
{% endfor %}
</select>
</td>
<td style="text-align:right;"><span> &copy; Copyright Alchemy 2005-2010</span></td>
</tr>

6
templates/web/prod/Baskets/Create.html.twig
View File

@@ -11,12 +11,12 @@
<script type="text/javascript">
$(document).ready(function(){
var $dialog = p4.Dialog.get(1);
var $dialogBox = $dialog.getDomElement();
$('input[name="lst"]', $dialogBox).val(p4.Results.Selection.serialize());
var buttons = $dialog.getOption('buttons');
buttons[language.create] = function(){$('form', $dialogBox).trigger('submit')};
$dialog.setOption('buttons', buttons);

6
templates/web/prod/Story/Create.html.twig
View File

@@ -6,7 +6,7 @@
<option value="{{ collection.get_base_id() }}">{{ collection.get_databox().get_viewname() }} / {{ collection.get_name() }}</option>
{% endfor %}
</select>
<label>{% trans 'Story name' %}</label>
<input name="name" value="" type="text"/>
@@ -22,11 +22,11 @@
var $dialogBox = $dialog.getDomElement();
$('input[name="lst"]', $dialogBox).val(p4.Results.Selection.serialize());
var buttons = $dialog.getOption('buttons');
buttons[language.create] = function(){$('form', $dialogBox).trigger('submit')};
$dialog.setOption('buttons', buttons);
$('form', $dialogBox).bind('submit', function(event){
var $form = $(this);