Skip to content
Extraits de code Groupes Projets
Valider bc652d7a rédigé par Matthieu Napoli's avatar Matthieu Napoli
Parcourir les fichiers

Improve the layout of UserCountry forms

parent 7662e42b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
Masquer les modifications d'espaces
En ligne Côte à côte
plugins/UserCountry/templates/_updaterManage.twig
+ 14
− 17
Voir le fichier @ bc652d7a
...@@ -17,11 +17,9 @@ ...@@ -17,11 +17,9 @@
<td width="150">{{ 'UserCountry_LocationDatabase'|translate }}</td> <td width="150">{{ 'UserCountry_LocationDatabase'|translate }}</td>
<td><input type="text" id="geoip-location-db" value="{{ geoIPLocUrl }}"/></td> <td><input type="text" id="geoip-location-db" value="{{ geoIPLocUrl }}"/></td>
<td width="164"> <td width="164">
{% set locationHint %} <div class="alert alert-info">
{{ 'UserCountry_LocationDatabaseHint'|translate }} {{ 'UserCountry_LocationDatabaseHint'|translate }}
{% endset %} </div>
{% import 'macros.twig' as piwik %}
{{ piwik.inlineHelp(locationHint) }}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -42,18 +40,17 @@ ...@@ -42,18 +40,17 @@
<label for="geoip-update-period-week">{{ 'CoreHome_PeriodWeek'|translate }}</label> <label for="geoip-update-period-week">{{ 'CoreHome_PeriodWeek'|translate }}</label>
</td> </td>
<td width="164"> <td width="164">
{% set lastTimeRunNote %} <div class="alert alert-info">
{% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %} {% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %}
{{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }} {{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }}
{% else %} {% else %}
{{ 'UserCountry_UpdaterHasNotBeenRun'|translate }} {{ 'UserCountry_UpdaterHasNotBeenRun'|translate }}
{% endif %} {% endif %}
<br/><br/> <br/><br/>
<div id="geoip-updater-next-run-time"> <div id="geoip-updater-next-run-time">
{% include "@UserCountry/_updaterNextRunTime.twig" %} {% include "@UserCountry/_updaterNextRunTime.twig" %}
</div> </div>
{% endset %} </div>
{{ piwik.inlineHelp(lastTimeRunNote) }}
</td> </td>
</tr> </tr>
</table> </table>
......
plugins/UserCountry/templates/adminIndex.twig
+ 10
− 14
Voir le fichier @ bc652d7a
...@@ -60,36 +60,32 @@ ...@@ -60,36 +60,32 @@
</td> </td>
<td width="164"> <td width="164">
{% if provider.status == 1 %} {% if provider.status == 1 %}
{% set currentLocation %} <div class="alert alert-info">
{% if thisIP != '127.0.0.1' %} {% if thisIP != '127.0.0.1' %}
{{ 'UserCountry_CurrentLocationIntro'|translate }}: {{ 'UserCountry_CurrentLocationIntro'|translate }}:
<div style="text-align:left;"> <div>
<br/> <br/>
<span class="loadingPiwik" style="display:none;position:absolute;"> <span class="loadingPiwik" style="display:none;position:absolute;">
<img src="./plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_Loading'|translate }}</span> <img src="./plugins/Morpheus/images/loading-blue.gif"/> {{ 'General_Loading'|translate }}</span>
<span class="location"><strong><em>{{ provider.location|raw }}</em></strong></span> <span class="location"><strong>{{ provider.location|raw }}</strong></span>
</div> </div>
<div style="text-align:right;"> <div class="text-right">
<a href="#" class="refresh-loc" data-impl-id="{{ id }}"><em>{{ 'General_Refresh'|translate }}</em></a> <a href="#" class="refresh-loc" data-impl-id="{{ id }}"><em>{{ 'General_Refresh'|translate }}</em></a>
</div> </div>
{% else %} {% else %}
{{ 'UserCountry_CannotLocalizeLocalIP'|translate(thisIP) }} {{ 'UserCountry_CannotLocalizeLocalIP'|translate(thisIP) }}
{% endif %} {% endif %}
{% endset %} </div>
{{ piwik.inlineHelp(currentLocation) }}
{% endif %} {% endif %}
{% if provider.statusMessage is defined and provider.statusMessage %} {% if provider.statusMessage is defined and provider.statusMessage %}
{% set brokenReason %} <div class="alert alert-info">
{% if provider.status == 2 %}<strong><em>{{ 'General_Error'|translate }}:</em></strong> {% endif %}{{ provider.statusMessage|raw }} {% if provider.status == 2 %}<strong>{{ 'General_Error'|translate }}:</strong> {% endif %}{{ provider.statusMessage|raw }}
{% endset %} </div>
{{ piwik.inlineHelp(brokenReason) }}
{% endif %} {% endif %}
{% if provider.extra_message is defined and provider.extra_message %} {% if provider.extra_message is defined and provider.extra_message %}
{% set extraMessage %} <div class="alert alert-info">
{{ provider.extra_message|raw }} {{ provider.extra_message|raw }}
{% endset %} </div>
<br/>
{{ piwik.inlineHelp(extraMessage) }}
{% endif %} {% endif %}
</td> </td>
{% endfor %} {% endfor %}
......
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter