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

Merge branch 'PHRAS-1745_PORT_custom_links' into PHRAS-1735_add_git_log

Browse Source 
# Conflicts:
#	.bowerrc
This commit is contained in:
Mike Ng
2018-01-08 16:37:46 +04:00
parent a853ec7d8d
commit a08a55b58e
9 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
templates/web/admin/setup.html.twig
View File

@@ -37,16 +37,16 @@
{% if daform.vars['label'] != null %}
<fieldset>
<legend>{{ daform.vars['label'] }}</legend>
{% for formdata in daform %}
{% for formdata in daform %}
<div class="control-group">
{{ form_errors(formdata) }}
{{ form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }}
{{ form_label(formdata, null, { 'label_attr': {'class' : 'control-label'} } ) }}
<div class="controls">
{{ form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }}
{{ form_widget(formdata, {'attr': {'class': 'input-xxlarge'}}) }}
</div>
<div>{{ formdata.vars['help_message'] }}</div>
{{ form_rest(formdata) }}
{{ form_rest(formdata) }}
</div>
{% endfor %}
{{ form_rest(daform) }}
@@ -157,6 +157,7 @@
updateInputNameColor($(element).parent().siblings(':first').find("input"), $(element).val());
});
}
$("#custom-link-table").on('click', '.close-row', function () {
$(this).closest('tr').remove();
var rowCount = $('#custom-link-table tr').length;
@@ -179,6 +180,7 @@
element.css("background", color);
}
}
function updateInputNameColor(element, color) {
element.css("background-color", color);
if (color === "") {