update Piwik to version 2.16 (fixes #91)
This commit is contained in:
oliver
parent
296343bf3b
commit
d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
|
|
@ -0,0 +1,16 @@
|
|||
<div piwik-dialog="$parent.showAddSiteDialog"
|
||||
title="{{ 'SitesManager_ChooseMeasurableTypeHeadline'|translate }}">
|
||||
|
||||
<div class="ui-dialog-buttonpane ui-widget-content ui-helper-clearfix">
|
||||
<div class="ui-dialog-buttonset">
|
||||
<button type="button"
|
||||
ng-repeat="type in availableTypes"
|
||||
title="{{ type.description }}"
|
||||
class="ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"
|
||||
ng-click="addSite(type.id);closeAddMeasurableDialog()"
|
||||
aria-disabled="false">
|
||||
<span class="ui-button-text">{{ type.name }}</span>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
<div ng-show="!siteIsBeingEdited" class="sitesButtonBar clearfix">
|
||||
|
||||
<a ng-show="hasSuperUserAccess && availableTypes"
|
||||
class="btn addSite"
|
||||
ng-click="addNewEntity()" tabindex="1">
|
||||
{{ availableTypes.length > 1 ? ('SitesManager_AddMeasurable'|translate) : ('SitesManager_AddSite'|translate) }}
|
||||
</a>
|
||||
|
||||
<div class="search" ng-show="adminSites.hasPrev || adminSites.hasNext || adminSites.searchTerm">
|
||||
<input ng-model="adminSites.search" piwik-onenter="adminSites.searchSite(adminSites.search)"
|
||||
placeholder="{{ 'Actions_SubmenuSitesearch' | translate }}" type="text">
|
||||
<img ng-click="adminSites.searchSite(adminSites.search)" title="{{ 'General_ClickToSearch' | translate }}"
|
||||
class="search_ico" src="plugins/Morpheus/images/search_ico.png"/>
|
||||
</div>
|
||||
|
||||
<div class="paging" ng-show="adminSites.hasPrev || adminSites.hasNext">
|
||||
<a class="btn prev" ng-disabled="!adminSites.hasPrev" ng-click="adminSites.previousPage()">
|
||||
<span style="cursor:pointer;">« {{ 'General_Previous'|translate }}</span>
|
||||
</a>
|
||||
<span class="counter" ng-show="adminSites.hasPrev || adminSites.hasNext">
|
||||
<span ng-if="adminSites.searchTerm">
|
||||
{{ 'General_PaginationWithoutTotal'|translate:adminSites.offsetStart:adminSites.offsetEnd }}
|
||||
</span>
|
||||
<span ng-if="!adminSites.searchTerm">
|
||||
{{ 'General_Pagination'|translate:adminSites.offsetStart:adminSites.offsetEnd:totalNumberOfSites }}
|
||||
</span>
|
||||
</span>
|
||||
<a class="btn next" ng-disabled="!adminSites.hasNext" ng-click="adminSites.nextPage()">
|
||||
<span style="cursor:pointer;" class="pointer">{{ 'General_Next'|translate }} »</span>
|
||||
</a>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -0,0 +1,152 @@
|
|||
<div class="site" ng-class="{'editingSite': site.editMode==true}">
|
||||
|
||||
<div class="row" ng-if="!site.editMode">
|
||||
|
||||
<div class="col-md-3">
|
||||
<h4>{{ site.name }}</h4>
|
||||
<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-4">
|
||||
<ul>
|
||||
<li><span class="title">{{ 'SitesManager_Timezone'|translate }}:</span> {{ site.timezone }}</li>
|
||||
<li><span class="title">{{ 'SitesManager_Currency'|translate }}:</span> {{ site.currency }}</li>
|
||||
<li ng-show="site.ecommerce == 1">
|
||||
<span class="title">{{ 'Goals_Ecommerce'|translate }}:</span> {{ 'General_Yes'|translate }}
|
||||
</li>
|
||||
<li ng-show="site.sitesearch == 1">
|
||||
<span class="title">{{ 'Actions_SubmenuSitesearch'|translate }}:</span> {{ 'General_Yes'|translate }}
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<ul>
|
||||
<li>
|
||||
<span class="title">{{ 'SitesManager_Urls'|translate }}</span>:
|
||||
{{ site.alias_urls.join(', ') }}
|
||||
</li>
|
||||
<li ng-show="site.excluded_ips.length">
|
||||
<span class="title">{{ 'SitesManager_ExcludedIps'|translate }}:</span>
|
||||
{{ site.excluded_ips.join(', ') }}
|
||||
</li>
|
||||
<li ng-show="site.excluded_parameters.length">
|
||||
<span class="title">{{ 'SitesManager_ExcludedParameters'|translate }}:</span>
|
||||
{{ site.excluded_parameters.join(', ') }}
|
||||
</li>
|
||||
<li ng-if="globalSettings.siteSpecificUserAgentExcludeEnabled && site.excluded_user_agents.length">
|
||||
<span class="title">{{ 'SitesManager_ExcludedUserAgents'|translate }}:</span>
|
||||
{{ site.excluded_user_agents.join(', ') }}
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
<div class="col-md-1 text-right">
|
||||
<ul>
|
||||
<li>
|
||||
<button class="btn btn-flat btn-lg" ng-click="editSite()" title="{{ 'General_Edit'|translate }}">
|
||||
<span class="icon-edit"></span>
|
||||
</button>
|
||||
</li>
|
||||
<li>
|
||||
<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>
|
||||
|
||||
</div>
|
||||
|
||||
<div ng-if="site.editMode">
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'General_Name'|translate }}</label>
|
||||
<input type="text" ng-model="site.name"/>
|
||||
</div>
|
||||
|
||||
<div class="form-group typeSettings"
|
||||
ng-include="'?module=SitesManager&action=getMeasurableTypeSettings&idSite=' + site.idsite + '&idType=' + site.type"
|
||||
>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'SitesManager_Urls'|translate }}</label>
|
||||
<div class="form-help">
|
||||
{{ 'SitesManager_AliasUrlHelp' | translate }}
|
||||
</div>
|
||||
<div sites-manager-multiline-field field="site.alias_urls" cols="25" rows="3"></div>
|
||||
|
||||
<div class="form-help">
|
||||
{{ 'SitesManager_OnlyMatchedUrlsAllowedHelp' | translate }}
|
||||
{{ 'SitesManager_OnlyMatchedUrlsAllowedHelpExamples' | translate }}
|
||||
</div>
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" ng-model="site.exclude_unknown_urls" ng-true-value="1" ng-false-value="0"> {{ 'SitesManager_OnlyMatchedUrlsAllowed' | translate:'':'' }}
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'SitesManager_KeepURLFragmentsLong'|translate }}</label>
|
||||
<select ng-options="key as value for (key, value) in keepURLFragmentsOptions"
|
||||
ng-model="site.keep_url_fragment"></select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'SitesManager_ExcludedIps'|translate }}</label>
|
||||
<div ng-include="'plugins/SitesManager/templates/help/excluded-ip-help.html'"></div>
|
||||
<div sites-manager-multiline-field field="site.excluded_ips" cols="20" rows="4"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'SitesManager_ExcludedParameters'|translate }}</label>
|
||||
<div ng-include="'plugins/SitesManager/templates/help/excluded-query-parameters-help.html'"></div>
|
||||
<div sites-manager-multiline-field field="site.excluded_parameters" cols="20" rows="4"></div>
|
||||
</div>
|
||||
|
||||
<div class="form-group" ng-if="globalSettings.siteSpecificUserAgentExcludeEnabled">
|
||||
<label>{{ 'SitesManager_ExcludedUserAgents'|translate }}</label>
|
||||
<div ng-include="'plugins/SitesManager/templates/help/excluded-user-agents-help.html'"></div>
|
||||
<div sites-manager-multiline-field field="site.excluded_user_agents" cols="20" rows="4"></div>
|
||||
</div>
|
||||
|
||||
<div ng-include="'plugins/SitesManager/templates/sites-list/site-search-field.html'"></div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'SitesManager_Timezone'|translate }}</label>
|
||||
<div ng-include="'plugins/SitesManager/templates/help/timezone-help.html'"></div>
|
||||
<select ng-model="site.timezone" ng-options="t.code as t.label group by t.group for t in timezones"></select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'SitesManager_Currency'|translate }}</label>
|
||||
<div class="form-help">
|
||||
{{ 'SitesManager_CurrencySymbolWillBeUsedForGoals' | translate }}
|
||||
</div>
|
||||
<select ng-model="site.currency" ng-options="k as v for (k, v) in currencies"></select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'Goals_Ecommerce'|translate }}</label>
|
||||
<div class="form-help">
|
||||
{{ 'SitesManager_EcommerceHelp' | translate }}
|
||||
<br/>
|
||||
<span ng-bind-html="'SitesManager_PiwikOffersEcommerceAnalytics'|translate:'<a href=\'http://piwik.org/docs/ecommerce-analytics/\' target=\'_blank\'>':'</a>'"></span>
|
||||
</div>
|
||||
<select ng-options="option.key as option.value for option in eCommerceptions" ng-model="site.ecommerce"></select>
|
||||
</div>
|
||||
|
||||
<div class="editingSiteFooter">
|
||||
<input type="submit" class="btn" value="{{ 'General_Save' | translate }}" ng-click="saveSite()"/>
|
||||
<button class="btn btn-link" ng-click="cancelEditSite($event)">{{ 'General_Cancel' | translate:'':'' }}</button>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -0,0 +1,64 @@
|
|||
<div class="form-group">
|
||||
<label>{{ 'Actions_SubmenuSitesearch'|translate }}</label>
|
||||
<div class="form-help">
|
||||
{{ 'SitesManager_SiteSearchUse'|translate }}
|
||||
</div>
|
||||
<select ng-options="option.key as option.value for option in siteSearchOptions" ng-model="site.sitesearch"></select>
|
||||
</div>
|
||||
|
||||
<div ng-if="site.sitesearch">
|
||||
|
||||
<div ng-show="globalSettings.searchKeywordParametersGlobal.length" class="form-group">
|
||||
|
||||
<label class="checkbox">
|
||||
<input type="checkbox" ng-model="site.useDefaultSiteSearchParams">
|
||||
|
||||
<span ng-show="hasSuperUserAccess"
|
||||
ng-bind-html="'SitesManager_SearchUseDefault'|translate:'<a href=\'#globalSettings\'>':'</a>'">
|
||||
</span>
|
||||
<span ng-hide="hasSuperUserAccess">
|
||||
{{ 'SitesManager_SearchUseDefault' | translate:'':'' }}
|
||||
</span>
|
||||
</label>
|
||||
|
||||
<span ng-show="site.useDefaultSiteSearchParams" class="form-description">
|
||||
|
||||
{{ 'SitesManager_SearchKeywordLabel' | translate }}
|
||||
({{ 'General_Default' | translate }}) :
|
||||
|
||||
<span ng-repeat="param in globalSettings.searchKeywordParametersGlobal">
|
||||
{{ param }}<span ng-show="!$last">, </span>
|
||||
</span>
|
||||
|
||||
<span ng-show="globalSettings.searchCategoryParametersGlobal.length">
|
||||
& {{ 'SitesManager_SearchCategoryLabel' | translate }} :
|
||||
<span ng-repeat="param in globalSettings.searchCategoryParametersGlobal">
|
||||
{{ param }}<span ng-show="!$last">, </span>
|
||||
</span>
|
||||
</span>
|
||||
|
||||
</span>
|
||||
|
||||
</div>
|
||||
|
||||
<div ng-hide="site.useDefaultSiteSearchParams">
|
||||
|
||||
<div class="form-group">
|
||||
<label>{{ 'SitesManager_SearchKeywordLabel' | translate }}</label>
|
||||
<div class="form-help">
|
||||
{{ 'SitesManager_SearchKeywordParametersDesc' | translate }}
|
||||
</div>
|
||||
<input ng-list ng-model="site.sitesearch_keyword_parameters">
|
||||
</div>
|
||||
|
||||
<div ng-show="customVariablesActivated" class="form-group">
|
||||
<label>{{ 'SitesManager_SearchCategoryLabel' | translate }}</label>
|
||||
<div class="form-help">
|
||||
{{ 'Goals_Optional' | translate }} {{ 'SitesManager_SearchCategoryParametersDesc' | translate }}
|
||||
</div>
|
||||
<input ng-list ng-model="site.sitesearch_category_parameters">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
<div class="sitesManagerList">
|
||||
|
||||
<div ng-repeat="site in adminSites.sites" ng-include="'plugins/SitesManager/templates/dialogs/dialogs.html?cb=' + cacheBuster"></div>
|
||||
|
||||
<p ng-if="adminSites.searchTerm && 0 === adminSites.sites.length && !adminSites.isLoading">
|
||||
{{ 'SitesManager_NotFound'|translate }} <strong>{{ adminSites.searchTerm }}</strong>
|
||||
</p>
|
||||
|
||||
<div ng-controller="SitesManagerSiteController" ng-repeat="site in adminSites.sites"
|
||||
ng-include="'plugins/SitesManager/templates/sites-list/site-fields.html?cb=' + cacheBuster">
|
||||
</div>
|
||||
|
||||
</div>
|
||||
Loading…
Add table
Add a link
Reference in a new issue