diff options
| author | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
|---|---|---|
| committer | mattab <matthieu.aubry@gmail.com> | 2013-08-11 13:19:59 +0400 |
| commit | f9b15e948fc9639ada0f925a5d450e6e158b5f56 (patch) | |
| tree | 3d6a25c8a271deee7d1136a11c11926be1d33529 /plugins/SitesManager | |
| parent | a96ec40e983a8b64f4c25def541a519ff3670e6a (diff) | |
| parent | 64ca5d548c0cf0c4eef9f5f104901fbf14800127 (diff) | |
Merge remote-tracking branch 'origin/master' into plugin_namespaces
Conflicts:
core/Tracker/Request.php
core/ViewDataTable.php
core/ViewDataTable/HtmlTable/Goals.php
plugins/Actions/Actions.php
plugins/Annotations/API.php
plugins/CoreHome/CoreHome.php
plugins/DBStats/DBStats.php
plugins/DevicesDetection/DevicesDetection.php
plugins/Goals/Goals.php
plugins/Live/Live.php
plugins/Referers/Referers.php
plugins/UserSettings/UserSettings.php
plugins/UsersManager/API.php
plugins/VisitTime/VisitTime.php
plugins/VisitorInterest/VisitorInterest.php
Diffstat (limited to 'plugins/SitesManager')
| -rw-r--r-- | plugins/SitesManager/javascripts/SitesManager.js | 2 | ||||
| -rw-r--r-- | plugins/SitesManager/stylesheets/SitesManager.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js index 73000c3969..e3bcd8c516 100644 --- a/plugins/SitesManager/javascripts/SitesManager.js +++ b/plugins/SitesManager/javascripts/SitesManager.js @@ -306,7 +306,7 @@ function SitesManager(_timezones, _currencies, _defaultTimezone, _defaultCurrenc $('#defaultCurrency').html(getCurrencySelector(defaultCurrency)); $('td.editableSite').click(function () { $(this).parent().find('.editSite').click(); }); - } + }; function getSitesearchSelector(contentBefore) { var globalKeywordParameters = $('input#globalSearchKeywordParameters').val().trim(); diff --git a/plugins/SitesManager/stylesheets/SitesManager.less b/plugins/SitesManager/stylesheets/SitesManager.less index 0196289bee..fca6f5d8bf 100644 --- a/plugins/SitesManager/stylesheets/SitesManager.less +++ b/plugins/SitesManager/stylesheets/SitesManager.less @@ -21,7 +21,7 @@ .addRowSite:before { display: inline-block; - content: url(../../UsersManager/images/add.png); + content: url(plugins/UsersManager/images/add.png); vertical-align: middle; } |