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/SitesManager | |
| 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/SitesManager')
| -rw-r--r-- | plugins/SitesManager/templates/sites-list/site-fields.html | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/plugins/SitesManager/templates/sites-list/site-fields.html b/plugins/SitesManager/templates/sites-list/site-fields.html index 7e56b1623d..888d9f7b1f 100644 --- a/plugins/SitesManager/templates/sites-list/site-fields.html +++ b/plugins/SitesManager/templates/sites-list/site-fields.html @@ -7,9 +7,15 @@ <ul> <li><span class="title">{{ 'General_Id'|translate }}:</span> {{ site.idsite }}</li> <li ng-show="availableTypes.length > 1"><span class="title">Type:</span> {{ currentType.name }}</li> + <li ng-show="site.idsite && howToSetupUrl"> + <a target="{{ isInternalSetupUrl ? '_self' : '_blank' }}" title="{{ 'SitesManager_ShowTrackingTag'|translate }}" + ng-href="{{ howToSetupUrl }}{{ isInternalSetupUrl ? '&idSite=' + site.idsite + '&period=' + period + '&date=' + date +'&updated=false' : ''}}"> + {{ 'SitesManager_ShowTrackingTag'|translate }} + </a> + </li> </ul> </div> - <div class="col-md-3"> + <div class="col-md-4"> <ul> <li><span class="title">{{ 'SitesManager_Timezone'|translate }}:</span> {{ site.timezone }}</li> <li><span class="title">{{ 'SitesManager_Currency'|translate }}:</span> {{ site.currency }}</li> @@ -41,23 +47,17 @@ </li> </ul> </div> - <div class="col-md-2 text-right"> + <div class="col-md-1 text-right"> <ul> <li> - <span class="link_but" ng-click="editSite()"> - <img src='plugins/Morpheus/images/ico_edit.png' title="{{ 'General_Edit'|translate }}"/> - Edit - </span> + <button class="btn btn-flat btn-lg" ng-click="editSite()" title="{{ 'General_Edit'|translate }}"> + <span class="icon-edit"></span> + </button> </li> <li> - <span ng-show="site.idsite" class="link_but" ng-click="openDeleteDialog()"> - <img src='plugins/Morpheus/images/ico_delete.png' title="{{ 'General_Delete'|translate }}"/> - Delete - </span> - </li> - <li ng-show="site.idsite && howToSetupUrl"> - <a target="{{ isInternalSetupUrl ? '_self' : '_blank' }}" ng-href="{{ howToSetupUrl }}{{ isInternalSetupUrl ? '&idSite=' + site.idsite + '&period=' + period + '&date=' + date +'&updated=false' : ''}}"> - {{ 'SitesManager_ShowTrackingTag'|translate }}</a> + <button class="btn btn-flat btn-lg" ng-show="site.idsite" ng-click="openDeleteDialog()" title="{{ 'General_Delete'|translate }}"> + <span class="icon-delete"></span> + </button> </li> </ul> </div> @@ -141,4 +141,4 @@ </div> -</div>
\ No newline at end of file +</div> |