Skip to content

GitLab

Vous avez reçu un message "Your GitLab account has been locked ..." ? Pas d'inquiétude : lisez cet article https://docs.gricad-pages.univ-grenoble-alpes.fr/help/unlock/

Commit e0ce0599 authored by Arnaud Bey's avatar Arnaud Bey
Browse files

fix UI

parent dca1bd52
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
application/src/MagicWordBundle/Resources/views/Administration/combopoints.html.twig
View file @ e0ce0599
......@@ -11,7 +11,7 @@
{% for combopoint in combopoints %}
<li class="list-group-item">
{{ combopoint.length }} {{'forms'| trans}} - {{ combopoint.points }}pts
<span class="pull-right">
<span class="float-right">
<a href="{{ path('combopoint_edit', {"id": combopoint.id}) }}" class="btn btn-outline-secondary btn-sm">
<i class="fa fa-pencil" aria-hidden="true"></i> Editer
</a>
......
application/src/MagicWordBundle/Resources/views/Administration/general-parameters.html.twig
View file @ e0ce0599
......@@ -7,7 +7,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "general_parameters" | trans}}
<span class="pull-right">
<span class="float-right">
<a class="btn btn-sm btn-outline-secondary" href="{{ path('general_parameters_edit') }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
{{ "edit" | trans }}
......
application/src/MagicWordBundle/Resources/views/Administration/letterslanguage.html.twig
View file @ e0ce0599
......@@ -11,7 +11,7 @@
{% for letter in letters %}
<li class="list-group-item">
{{letter.value | upper }} - {{letter.value}} - {{ letter.points }}pts
<span class="pull-right">
<span class="float-right">
<a href="{{ path('letter_edit', {"id": letter.id}) }}" class="btn btn-outline-secondary btn-sm">
<i class="fa fa-pencil" aria-hidden="true"></i> Editer
</a>
......
application/src/MagicWordBundle/Resources/views/Administration/wordlength.html.twig
View file @ e0ce0599
......@@ -11,7 +11,7 @@
{% for wordlength in wordlengths %}
<li class="list-group-item">
{{ wordlength.length }} lettres - {{ wordlength.points }}pts
<span class="pull-right">
<span class="float-right">
<a href="{{ path('wordlength_edit', {"id": wordlength.id}) }}" class="btn btn-outline-secondary btn-sm">
<i class="fa fa-pencil" aria-hidden="true"></i> Editer
</a>
......
application/src/MagicWordBundle/Resources/views/FoundableForm/details.html.twig
View file @ e0ce0599
......@@ -19,9 +19,9 @@
<li class="list-group-item">
{{ word.value }}
( <a href="{{ path('root', {"id": root.id }) }}"> {{ root.value }}</a>)
<span class="pull-right">
<span class="float-right">
<span class="btn btn-outline-secondary btn-sm" onClick="wiktionnary.getDef('{{ root.value }}', '{{ language.value |slice(0,2) }}')">
<i class="fa fa-wikipedia-w" aria-hidden="true"></i>
<i class="fab fa-wikipedia-w"></i>
</span>
{% if isInWordbox(root) == false %}
<span class="btn btn-outline-secondary btn-sm" onclick="addToWordbox({{ root.id }}, this);">
......
application/src/MagicWordBundle/Resources/views/FoundableForm/found.html.twig
View file @ e0ce0599
......@@ -5,7 +5,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'found' | trans }} {{ language.value | trans }}
<span class="pull-right">
<span class="float-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('form', this, '#found', '#found li')">
<i class="fa fa-sort" aria-hidden="true"></i> A-Z
</button>
......
application/src/MagicWordBundle/Resources/views/FoundableForm/macros.html.twig
View file @ e0ce0599
......@@ -17,7 +17,7 @@
<div class="card">
<div data-toggle="collapse" data-target="#{{ type ~ '-' ~ foundable.id }}" class="btn card-header {% if activity and foundable in activity.foundForms and type == "foundable" %}bg-success{% endif %}" >
{{ foundable.form | upper }} <span class="text-muted">({{ foundable.points}})</span>
<span class="pull-right">
<span class="float-right">
<span class="badge badge-light">{{ percent }}</span>
</span>
</div>
......@@ -26,9 +26,9 @@
{% for inflection in foundable.words %}
<li class="list-group-item">
{{ inflection.value }} ({{ inflection.root.value }})
<span class="pull-right">
<span class="float-right">
<button role="button" class="btn btn-sm" onClick="wiktionnary.getDef('{{ inflection.root.value }}', '{{ foundable.grid.language.value |slice(0,2) }}')">
<i class="fa fa-wikipedia-w" aria-hidden="true"></i>
<i class="fab fa-wikipedia-w"></i>
</button>
{% if isInWordbox(inflection.root) == false %}
<button class="btn btn-sm" onclick="addToWordbox({{ inflection.root.id }}, this);">
......@@ -52,7 +52,7 @@
<div style="float:left; width:80px">
<div class="label label-default">{{ percent }}</div> &nbsp;
<span class="btn btn-sm" onClick="wiktionnary.getDef('{{ foundable.words[0].root.content }}', '{{ foundable.grid.language.value |slice(0,2) }}')">
<i class="fa fa-wikipedia-w" aria-hidden="true"></i>
<i class="fab fa-wikipedia-w"></i>
</span>
</div>
{{ foundable.form | upper }} <span class="text-muted">({{ foundable.points}}pts)</span>
......
application/src/MagicWordBundle/Resources/views/Game/Massive/builder.html.twig
View file @ e0ce0599
......@@ -6,7 +6,7 @@
<div class="card">
<div class="card-header">
{{ 'massive' | trans }} - <strong>{{ massive.name }}</strong> {% if massive.description %}({{ massive.description }}){% endif %}
<span class="pull-right">
<span class="float-right">
<span class="btn btn-outline-secondary btn-sm" onclick="builder.export({{massive.id}})">
<i class="fa fa-clipboard" aria-hidden="true"></i>
{{ "export_game" | trans }}
......@@ -31,7 +31,7 @@
<div class="tab-pane fade show active" id="rounds">
<div class="row">
<div class="col mt-3">
<h5 class="text-right">
<h5 class="float-right">
<button type="button" class="btn btn-sm btn-secondary dropdown-toggle" data-toggle="dropdown" id="dropdownMenuButton" aria-haspopup="true" aria-expanded="false">
<i class="fa fa-plus" aria-hidden="true"></i> {{ 'add_round' | trans }}
</button>
......@@ -48,7 +48,7 @@
{{order}} - {{ round.discr | trans }} - {{ round.language.value | trans }}
- {{ round.title ? round.title : "(pas de titre)" }}
{% if round.description %}<span class="text-muted">({{ round.description }})</span>{% endif %}
<span class="pull-right btns">
<span class="float-right btns">
<div class="btn-group">
<a onclick="builder.reorder()" class="btn btn-outline-secondary btn-sm {% if order == 1 %}disabled{% endif %}" href="{{ path('round_move_up', {"massiveId": massive.id, "roundId": round.id }) }}">
<i class="fa fa-arrow-up" aria-hidden="true"></i>
......
application/src/MagicWordBundle/Resources/views/Game/Massive/form.html.twig
View file @ e0ce0599
......@@ -7,7 +7,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'new_massive' | trans }}
<span class="pull-right">
<span class="float-right">
<a class="btn btn-outline-secondary" href="{{ path('json_import_form') }}">
<i class="fa fa-caret-square-o-right" aria-hidden="true"></i>
{{ "json_import" | trans }}
......
application/src/MagicWordBundle/Resources/views/Game/Massive/list.html.twig
View file @ e0ce0599
......@@ -7,7 +7,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'massives' | trans }}
<span class="pull-right">
<span class="float-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('popularity', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "popularity" | trans }}
</button>
......@@ -31,7 +31,7 @@
<h4 class="panel-title">
"{{ massive.name }}" {% if massive.description %}<span class="text-muted">({{ massive.description}})</span>{% endif %}
par <a href="{{ path('profile', {"id": massive.author.id}) }}">{{ massive.author }}</a>
<span class="pull-right">
<span class="float-right">
<span class="label label-info">
<i class="fa fa-users" aria-hidden="true"></i>
<span class="hidden-xs"> {{ "popularity" | trans }}:</span> {{ popularity }}
......
application/src/MagicWordBundle/Resources/views/Game/Massive/my-published-list.html.twig
View file @ e0ce0599
......@@ -14,7 +14,7 @@
<a href="{{ path('massive_summary', {"id": massive.id}) }}">
{{ massive.name }} {% if massive.description %}<span class="text-muted">({{ massive.description}})</span>{% endif %}
</a>
<span class="pull-right">
<span class="float-right">
<span class="label label-info">
<i class="fa fa-users" aria-hidden="true"></i>
<span class="hidden-xs"> {{ "popularity" | trans }}:</span> {{ getActivityCount(massive) }}
......
application/src/MagicWordBundle/Resources/views/Game/Massive/partials/rounds.html.twig
View file @ e0ce0599
......@@ -6,7 +6,7 @@
<div class="card">
<div class="card-header">
{{ round.displayOrder+1 }} {{ round.title }} - {{ round.discr | trans }}
<span class="pull-right">
<span class="float-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('percent', this, '#round-{{round.id}}', '#round-{{round.id}} div.sortable')">
<i class="fa fa-sort" aria-hidden="true"></i> %
</button>
......
application/src/MagicWordBundle/Resources/views/Game/Massive/summary.html.twig
View file @ e0ce0599
......@@ -7,7 +7,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "summary" | trans }} <strong>{{ massive.name }}</strong>
<span class="pull-right">
<span class="float-right">
<span class="btn btn-sm btn-outline-secondary" onclick="builder.export({{massive.id}})">
<i class="fa fa-clipboard" aria-hidden="true"></i>
Exporter la partie
......
application/src/MagicWordBundle/Resources/views/Game/import.html.twig
View file @ e0ce0599
......@@ -5,7 +5,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'json_import' | trans }}
<span class="pull-right">
<span class="float-right">
<a class="btn btn-outline-secondary" href="{{ path('massive') }}">
<i class="fa fa-plus" aria-hidden="true"></i> {{ 'new_massive' | trans }}
</a>
......
application/src/MagicWordBundle/Resources/views/Game/started.html.twig
View file @ e0ce0599
......@@ -8,7 +8,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ 'games_started' | trans }}
<span class="pull-right">
<span class="float-right">
<button type="button" class="btn btn-outline-secondary btn-sm" data-order="asc" onclick="sorter.sort('gametype', this, '.games', '.game')">
<i class="fa fa-sort" aria-hidden="true"></i> {{ "gametype" | trans }}
</button>
......
application/src/MagicWordBundle/Resources/views/Grid/grid-pattern-edit.html.twig
View file @ e0ce0599
......@@ -9,7 +9,7 @@
{{ "save" | trans }}
</span>
{% if pattern.id %}
<span onclick="gridPatternHandler.delete({{ pattern.id }})" class="btn btn-sm btn-danger pull-right">
<span onclick="gridPatternHandler.delete({{ pattern.id }})" class="btn btn-sm btn-danger float-right">
<i class="fa fa-floppy-o" aria-hidden="true"></i>
{{ "delete" | trans }}
</span>
......
application/src/MagicWordBundle/Resources/views/Grid/grid-pattern-list.html.twig
View file @ e0ce0599
......@@ -9,7 +9,7 @@
{% for pattern in patterns if pattern.strings |length > 0 or pattern.author == app.user %}
<li class="list-group-item">
{{ pattern.name }} <span class="text-muted">{{ pattern.description }}</span>
<span class="pull-right">
<span class="float-right">
{% if pattern.author == app.user %}
<span class="btn btn-outline-secondary btn-sm" onclick="gridPatternHandler.edit({{ pattern.id }})">
<i class="fa fa-pencil-square-o" aria-hidden="true"></i>
......
application/src/MagicWordBundle/Resources/views/Grid/possible-inflections.html.twig
View file @ e0ce0599
......@@ -6,14 +6,14 @@
{% for foundableForm in foundableForms %}
<li class="list-group-item">
<span class="btn btn-outline-secondary btn-sm" onClick="wiktionnary.getDef('{{ foundableForm.words[0].root.value }}', '{{ foundableForm.grid.language.value |slice(0,2) }}')">
<i class="fa fa-wikipedia-w" aria-hidden="true"></i>
<i class="fab fa-wikipedia-w"></i>
</span>
{{ foundableForm.form }}
<span class="text-muted">
({{ foundableForm.points }}pts)
</span>
{% if btn %}
<span class="btn btn-outline-secondary btn-sm pull-right" onclick="findwords.addInflection('{{ foundableForm.form }}')">
<span class="btn btn-outline-secondary btn-sm float-right" onclick="findwords.addInflection('{{ foundableForm.form }}')">
<i class="fa fa-plus" aria-hidden="true"></i> {{ 'add_to_findwords' | trans }}
</span>
{% endif %}
......
application/src/MagicWordBundle/Resources/views/Lexicon/root.html.twig
View file @ e0ce0599
......@@ -5,7 +5,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "lemma_info" | trans}} <strong>{{ root.value }}</strong>
<span class="pull-right">
<span class="float-right">
{% if isInWordbox(root) == false %}
<a class="btn btn-outline-secondary" href="{{ path('add-to-wordbox', {"id": root.id }) }}">{{ "add_to_wordbox" | trans}}</a>
{% endif %}
......
application/src/MagicWordBundle/Resources/views/Lexicon/word.html.twig
View file @ e0ce0599
......@@ -5,7 +5,7 @@
<div class="card-header">
{% include "MagicWordBundle:Common:backtohome.html.twig" %}
{{ "inflexion_info" | trans}} {{ word.value }}
<span class="pull-right">
<span class="float-right">
<a class="btn btn-outline-secondary" href="{{ path('add-to-wordbox', {"id": word.root.id }) }}">{{ "add_to_wordbox" | trans}}</a>
</span>
</div>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment