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

PORT PHRAS-1555/PHRAS-1568 to 4.1

Browse Source
This commit is contained in:
Mike Ng
2017-11-22 15:48:36 +04:00
parent d736e3db36
commit 36b2058add
15 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,7 @@
<div class="input-append">
<input class="admin_adder" placeholder="{{ 'setup:: ajouter un administrateur des commandes' | trans }}"/>
<input type="hidden" name="admins[]"/>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::valider' | trans }}" />
<input type="submit" class="btn btn-primary" value="{{ 'boutton::valider' | trans }}" />
</div>
</form>
</div>

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

@@ -108,14 +108,14 @@
{% endfor %}
<input class="admin_adder input-large" placeholder="{{ 'Add an admin' | trans }}"/>
</ul>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::valider' | trans }}" />
<input type="submit" class="btn btn-primary" value="{{ 'boutton::valider' | trans }}" />
<input type="hidden" class="new" name="admins[]" />
</fieldset>
</form>
<form id="admin_reset" action="{{ path('admin_dashboard_reset_admin_rights') }}" method="post" class="form-inline" style="display:inline">
<fieldset>
<legend>{{ 'setup:: Reinitialisation des droits admins' | trans }}</legend>
<input type="submit" class="btn btn-warning" value="{{ 'boutton::reinitialiser' | trans }}" />
<input type="submit" class="btn btn-primary" value="{{ 'boutton::reinitialiser' | trans }}" />
</fieldset>
</form>
</div>
@@ -127,7 +127,7 @@
<legend>{{ 'setup::Tests d\'envois d\'emails' | trans }}</legend>
<div class="input-append">
<input class="span3" id="appendedInputButton" name="email" value="" type="text" placeholder="{% trans %}Email{% endtrans %}" required>
<input type="submit" class="btn btn-warning" value="{{ 'Send' | trans }}"/>
<input type="submit" class="btn btn-primary" value="{{ 'Send' | trans }}"/>
</div>
</fieldset>
</form>
@@ -143,7 +143,7 @@
<form id="cache_flusher" method="post" action="{{ path('admin_dashboard_flush_cache') }}" class="form-inline">
<fieldset>
<legend>{% trans %}Reset cache{% endtrans %}</legend>
<input type="submit" id="flush_button" class="btn btn-warning span4" value="Flush All Caches" />
<input type="submit" id="flush_button" class="btn btn-primary span4" value="Flush All Caches" />
</fieldset>
</form>
</div>

2
templates/web/admin/databox/cgus.html.twig
View File

@@ -8,7 +8,7 @@
<input type="checkbox" value="1" id="valid" name="valid"/>
{{ 'admin::CGU Les utilisateurs doivent imperativement revalider ces conditions' | trans }}
</label>
<input class='btn btn-warning' type="submit" value="{{ 'Mettre a jour' | trans }}"/>
<input class='btn btn-primary' type="submit" value="{{ 'Mettre a jour' | trans }}"/>
</div>
<div id="tabs">
<ul>

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

@@ -4,7 +4,7 @@
</script>
<script type="text/template" id="save_template">
<button type="button" class="btn btn-success save-all">
<button type="button" class="btn btn-primary save-all">
<i class="icon-hdd icon-white"></i> {% trans %}Save all changes{% endtrans %}
</button>
</script>

2
templates/web/admin/publications/fiche.html.twig
View File

@@ -125,7 +125,7 @@
</div>
</div>
<div>
<button class="btn btn-warning" type="submit">{{ 'boutton::valider' | trans }}</button>
<button class="btn btn-primary" type="submit">{{ 'boutton::valider' | trans }}</button>
<a href="{{ path('admin_feeds_list') }}" class="btn" style="text-decoration:none;">{{ 'boutton::annuler' | trans }}</a>
</div>
</form>

2
templates/web/admin/publications/list.html.twig
View File

@@ -42,7 +42,7 @@
</div>
</div>
<div class="form-actions">
<button type="submit" class="btn btn-warning">{{ 'boutton::valider' | trans }}</button>
<button type="submit" class="btn btn-primary">{{ 'boutton::valider' | trans }}</button>
</div>
</fieldset>
</form>

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

@@ -53,7 +53,7 @@
{% endfor %}
<div class="well well-large">
<div style="max-width: 400px;margin: 0 auto 10px;">
<input type="submit" class="btn btn-warning btn-block btn-large" value="{{ 'boutton::valider' | trans }}"/>
<input type="submit" class="btn btn-primary btn-block btn-large" value="{{ 'boutton::valider' | trans }}"/>
</div>
</div>
{{ form_end(form) }}

4
templates/web/admin/users.html.twig
View File

@@ -73,7 +73,7 @@
<form id="users_reset_rights" method="post" action="{{ path('admin_users_rights_reset') }}" target="_self" class="form-inline pull-right" style="margin:0">
<fieldset class="admin_head_opts">
<input type="hidden" value="" name="users">
<button type='button' class="btn btn-warning">{{ 'Delete all users rights' | trans }}</button>
<button type='button' class="btn btn-primary">{{ 'Delete all users rights' | trans }}</button>
</fieldset>
</form>
@@ -248,7 +248,7 @@
{% endif %}
<input name="like_value" value="{{parm.like_value}}" type="hidden" />
<input name="like_field" value="{{parm.like_field}}" type="hidden" />
<button class="btn btn-warning">{{ 'boutton::exporter' | trans }}</button>
<button class="btn btn-primary">{{ 'boutton::exporter' | trans }}</button>
</form>
<script type="text/javascript">