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

PHRAS-845 - fix close button

Browse Source 
PHRAS-846 - fix admin log view
PHRAS-843 - fix action icons
added white skin
misc fix on skin color handling
replace image icons by fonts icons
This commit is contained in:
Florian BLOUET
2015-12-01 18:48:38 +01:00
parent 696d7401d4
commit ebaf36f2d2
46 changed files with 672 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/web/admin/editusers.html.twig
View File

@@ -553,8 +553,8 @@
</div>
{% endif %}
</div>
<div class="PNB10" style="top:auto;height:20px;">
<button class="users_rights_valid btn">{{ 'boutton::valider' | trans }}</button>
<div class="form-actions" style="">
<button class="users_rights_valid btn btn-primary">{{ 'boutton::valider' | trans }}</button>
<a href="{{ path('admin_users_search') }}" class="users_rights_cancel btn" style="text-decoration:none">{{ 'boutton::retour' | trans }}</a>
</div>
</div>
@@ -1109,10 +1109,6 @@
"server": "{{ app['geonames.server-uri'] }}",
"limit": 40
});
/*console.log(geocompleter);
geocompleter.autocompleter("on", "geotocompleter.request.error", function(jqXhr, status, error) {
console.log('has failed', jqXhr, status, error );
});*/
});

2
templates/web/admin/subdefs.html.twig
View File

@@ -169,7 +169,7 @@
{% block content %}
<p>
<button id="create-subdef" class="btn btn-warning">{{ 'Create new subdef' | trans }}</button>
<button id="create-subdef" class="btn btn-success">{{ 'Create new subdef' | trans }}</button>
</p>
<div id="dialog-delete-subdef" title="{{ 'Delete the subdef ?' | trans }}" style="display:none;">
<p>

54
templates/web/admin/task-manager/task-editor/task.html.twig
View File

@@ -1,23 +1,7 @@
<div id="taskBody">
{% block css %}{% endblock %}
<div>
<form
name="task-edit"
method="POST"
action="{{ path('admin_tasks_task_save', {'task' : task.getId()}) }}"
class="form-inline no-ajax"
>
{% if form.vars.errors|length > 0 %}
{{ form_errors(form) }}
{% endif %}
{{ form_rest(form) }}
<a href="{{ path('admin_tasks_list') }}">{{ 'Cancel' | trans }}</a>
<button type="submit" class="btn btn-success btn-trigger " id="taskSaveButton">
{{ "Save" | trans }}
</button>
</form>
<div>
{{ 'admin::tasks: Nombre de crashes :' | trans }} <span id="crash-counter">{{ task.getCrashed() }}</span>
@@ -47,6 +31,27 @@
{% endblock %}
</div>
</div>
<form
name="task-edit"
method="POST"
action="{{ path('admin_tasks_task_save', {'task' : task.getId()}) }}"
class="form-inline no-ajax"
>
{% if form.vars.errors|length > 0 %}
{{ form_errors(form) }}
{% endif %}
{{ form_rest(form) }}
<div class="form-actions">
<button type="submit" class="btn btn-primary btn-trigger " id="taskSaveButton">
{{ "Save" | trans }}
</button>
<a href="{{ path('admin_tasks_list') }}">{{ 'Cancel' | trans }}</a>
</div>
</form>
{% block javascript %}
<script type="text/javascript">
@@ -148,7 +153,22 @@
, async:false
, success:function(data) {
if (data.success) {
loadRightAjax("{{ path('admin_tasks_list') }}");
console.log('should go back to list');
//loadRightAjax("{{ path('admin_tasks_list') }}");
/* var $this = $(this);
$('#right-ajax').empty().addClass('loading').parent().show();
$('#right').hide();
$.get($this.attr('href'), function (data) {
$('#right-ajax').removeClass('loading').html(data);
});
return false;
*/
} else {
if (window.console) {
console.log(data.message);