diff options
| author | Benaka <diosmosis@users.noreply.github.com> | 2015-08-24 20:00:00 +0300 |
|---|---|---|
| committer | Benaka <diosmosis@users.noreply.github.com> | 2015-08-24 20:00:00 +0300 |
| commit | 7de45e60108cd48465d6568a827ab9cab6c21015 (patch) | |
| tree | 15d08e8990e31da6357d10381e70384139723761 /plugins/UserCountry | |
| parent | c5714af4fa6d4db2b8cd06cf13db64b369960496 (diff) | |
| parent | ea523a822bdf846bf67f155c4e53ddc7e0420de3 (diff) | |
Merge pull request #8488 from piwik/icons
Fixes #7618, add new icons to Piwik & use where appropriate. Also includes slight re-designs to entity management tables & a new CSS API using the icons easily.
Diffstat (limited to 'plugins/UserCountry')
| -rwxr-xr-x | plugins/UserCountry/templates/_updaterManage.twig | 4 | ||||
| -rwxr-xr-x | plugins/UserCountry/templates/adminIndex.twig | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/UserCountry/templates/_updaterManage.twig b/plugins/UserCountry/templates/_updaterManage.twig index 26aadd8032..4f614787f1 100755 --- a/plugins/UserCountry/templates/_updaterManage.twig +++ b/plugins/UserCountry/templates/_updaterManage.twig @@ -17,7 +17,7 @@ <td width="150">{{ 'UserCountry_LocationDatabase'|translate }}</td> <td><input type="text" id="geoip-location-db" value="{{ geoIPLocUrl }}"/></td> <td width="164"> - <div class="alert alert-info"> + <div class="form-help"> {{ 'UserCountry_LocationDatabaseHint'|translate }} </div> </td> @@ -40,7 +40,7 @@ <label for="geoip-update-period-week">{{ 'Intl_PeriodWeek'|translate }}</label> </td> <td width="164"> - <div class="alert alert-info"> + <div class="form-help"> {% if lastTimeUpdaterRun is defined and lastTimeUpdaterRun is not empty %} {{ 'UserCountry_UpdaterWasLastRun'|translate(lastTimeUpdaterRun)|raw }} {% else %} diff --git a/plugins/UserCountry/templates/adminIndex.twig b/plugins/UserCountry/templates/adminIndex.twig index fe729a4497..fed5874b53 100755 --- a/plugins/UserCountry/templates/adminIndex.twig +++ b/plugins/UserCountry/templates/adminIndex.twig @@ -60,7 +60,7 @@ </td> <td width="164"> {% if provider.status == 1 %} - <div class="alert alert-info"> + <div class="form-help"> {% if thisIP != '127.0.0.1' %} {{ 'UserCountry_CurrentLocationIntro'|translate }}: <div> @@ -78,12 +78,12 @@ </div> {% endif %} {% if provider.statusMessage is defined and provider.statusMessage %} - <div class="alert alert-info"> + <div class="form-help"> {% if provider.status == 2 %}<strong>{{ 'General_Error'|translate }}:</strong> {% endif %}{{ provider.statusMessage|raw }} </div> {% endif %} {% if provider.extra_message is defined and provider.extra_message %} - <div class="alert alert-info"> + <div class="form-help"> {{ provider.extra_message|raw }} </div> {% endif %} |