update Piwik to version 2.16 (fixes #91)

This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions

View file

@ -0,0 +1,78 @@
{% extends 'admin.twig' %}
{% set title %}{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}{% endset %}
{% block content %}
{% if isSuperUser %}
<h2 piwik-enriched-headline>{{ title }}</h2>
{% if anonymousSites|length == 0 %}
<div class="alert alert-info">
{{ 'UsersManager_NoteNoAnonymousUserAccessSettingsWontBeUsed2'|translate }}
</div>
{% else %}
{{ ajax.errorDiv('ajaxErrorAnonymousUserSettings') }}
{{ ajax.loadingDiv('ajaxLoadingAnonymousUserSettings') }}
<div class="form-group">
<label>
{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate }}
</label>
<fieldset>
<label class="radio">
<input id="anonymousDefaultReport-login" type="radio" value="Login"
name="anonymousDefaultReport"
{% if anonymousDefaultReport==loginModule %} checked="checked"{% endif %} />
{{ 'UsersManager_TheLoginScreen'|translate }}
</label>
<label class="radio">
<input id="anonymousDefaultReport-multisites"
{% if anonymousSites is empty %}disabled="disabled" {% endif %}
type="radio" value="MultiSites" name="anonymousDefaultReport"
{% if anonymousDefaultReport=='MultiSites' %} checked="checked"{% endif %} />
{{ 'General_AllWebsitesDashboard'|translate }}
</label>
<label class="radio">
<input id="anonymousDefaultReport-specific"
{% if anonymousSites is empty %}disabled="disabled" {% endif %}
type="radio" value="1" name="anonymousDefaultReport"
{% if anonymousDefaultReport>0 %} checked="checked"{% endif %} />
{{ 'General_DashboardForASpecificWebsite'|translate }}
{% if anonymousSites is not empty %}
<select id="anonymousDefaultReportWebsite">
{% for info in anonymousSites %}
<option value="{{ info.idsite }}" {% if anonymousDefaultReport==info.idsite %} selected="selected"{% endif %}>
{{ info.name|raw }}
</option>
{% endfor %}
</select>
{% endif %}
</label>
</fieldset>
</div>
<div class="form-group">
<label>{{ 'UsersManager_ForAnonymousUsersReportDateToLoadByDefault'|translate }}</label>
<fieldset>
{% for value,description in availableDefaultDates %}
<label class="radio">
<input type="radio" name="anonymousDefaultDate"
{% if anonymousDefaultDate==value %}checked="checked" {% endif %}value="{{ value }}"/>
{{ description }}
</label>
{% endfor %}
</fieldset>
</div>
<input type="submit" value="{{ 'General_Save'|translate }}" id="anonymousUserSettingsSubmit" class="submit"/>
{% endif %}
{% endif %}
{% endblock %}

View file

@ -1,20 +1,22 @@
{% extends 'admin.twig' %}
{% set title %}{{ 'UsersManager_ManageAccess'|translate }}{% endset %}
{% block content %}
<h2 piwik-enriched-headline
help-url="http://piwik.org/docs/manage-users/">{{ 'UsersManager_ManageAccess'|translate }}</h2>
help-url="http://piwik.org/docs/manage-users/">{{ title }}</h2>
<div id="sites" class="usersManager">
<section class="sites_selector_container">
<p>{{ 'UsersManager_MainDescription'|translate }}</p>
<div class="sites_selector_title">{{ 'SitesManager_Sites'|translate }}:</div>
{% set applyAllSitesText %}
<strong>{{ 'UsersManager_ApplyToAllWebsites'|translate }}</strong>
{% endset %}
<div piwik-siteselector
show-selected-site="true"
only-sites-with-admin-access="true"
class="sites_autocomplete"
siteid="{{ idSiteSelected }}"
sitename="{{ defaultReportSiteName }}"
@ -25,17 +27,20 @@
</section>
</div>
{% block websiteAccessTable %}
{% import 'ajaxMacros.twig' as ajax %}
{{ ajax.errorDiv }}
{{ ajax.loadingDiv }}
<div class="entityContainer" style="width:600px;">
<div class="entityContainer" style="width:600px;margin-top:16px;">
{% if anonymousHasViewAccess %}
<div style="display:inline-block;margin-top:10px;" id="usersManagerAnonymousUserHasViewAccess">
{{ ['UsersManager_AnonymousUserHasViewAccess'|translate("'anonymous'","'view'"), 'UsersManager_AnonymousUserHasViewAccess2'|translate]|join(' ')|notification({'placeAt': '#usersManagerAnonymousUserHasViewAccess', 'noclear': true}) }}
<br/>
<div class="alert alert-warning">
{{ ['UsersManager_AnonymousUserHasViewAccess'|translate("'anonymous'","'view'"), 'UsersManager_AnonymousUserHasViewAccess2'|translate]|join(' ') }}
</div>
{% endif %}
<table class="entityTable dataTable" id="access" style="display:inline-table;width:500px;">
<table class="entityTable dataTable" id="access" style="display:inline-table;width:550px;">
<thead>
<tr>
<th class='first'>{{ 'UsersManager_User'|translate }}</th>
@ -51,6 +56,7 @@
{% set accesInvalid %}<img src='plugins/UsersManager/images/no-access.png' class='updateAccess' />{% endset %}
{% set superUserAccess %}<span title="{{ 'UsersManager_ExceptionSuperUserAccess'|translate }}">N/A</span>{% endset %}
{% for login,access in usersAccessByWebsite %}
{% if userIsSuperUser or (hasOnlyAdminAccess and (access!='noaccess' or idSiteSelected == 'all')) %}
<tr>
<td id='login'>{{ login }}</td>
<td>{{ usersAliasByLogin[login]|raw }}</td>
@ -80,12 +86,34 @@
{% endif %}
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
<div id="accessUpdated" style="vertical-align:top;"></div>
</div>
{% if hasOnlyAdminAccess %}
<p>
<button id="showGiveViewAccessForm" class="add-user btn btn-lg btn-flat">
<span class="icon-add"></span>
{{ 'UsersManager_GiveViewAccessTitle'|translate('"' ~ defaultReportSiteName ~ '"')|raw }}
</button>
</p>
<form id="giveViewAccessForm">
<div class="form-group">
<input type="text" name="user_invite"
id="user_invite"
placeholder="{{ 'UsersManager_EnterUsernameOrEmail'|translate|e('html_attr') }}"
title="{{ 'UsersManager_GiveViewAccessInstructions'|translate("'" ~ defaultReportSiteName ~ "'")|e('html_attr') }}">
</div>
<input class="btn" type="button" id="giveUserAccessToViewReports" value="{{ 'UsersManager_GiveViewAccess'|translate|e('html_attr') }}">
</form>
{{ ajax.errorDiv('ajaxErrorGiveViewAccess') }}
{{ ajax.loadingDiv('ajaxLoadingGiveViewAccess') }}
{% endif %}
<div class="ui-confirm" id="confirm">
<h2>{{ 'UsersManager_ChangeAllConfirm'|translate("<span id='login'></span>")|raw }}</h2>
<input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
@ -110,7 +138,7 @@
{% import 'ajaxMacros.twig' as ajax %}
{{ ajax.errorDiv('ajaxErrorUsersManagement') }}
{{ ajax.loadingDiv('ajaxLoadingUsersManagement') }}
<div class="entityContainer" style="margin-bottom:50px;">
<div class="user entityContainer" style="margin-bottom:50px;">
<table class="entityTable dataTable" id="users">
<thead>
<tr>
@ -135,28 +163,31 @@
<td id="password" class="editable">-</td>
<td id="email" class="editable">{{ user.email }}</td>
<td id="alias" class="editable">{{ user.alias|raw }}</td>
<td id="token_auth">{{ user.token_auth }}</td>
<td id="token_auth" class="token_auth" data-token="{{ user.token_auth }}">{{ user.token_auth|slice(0, 8) }}</td>
{% if user.last_seen is defined %}
<td id="last_seen">{% if user.last_seen is empty %}-{% else %}{{ 'General_TimeAgo'|translate(user.last_seen)|raw }}{% endif %}</td>
{% endif %}
<td>
<span class="edituser link_but" id="row{{ i }}">
<img title="{{ 'General_Edit'|translate }}" src='plugins/Zeitgeist/images/ico_edit.png'/>
<span>{{ 'General_Edit'|translate }}</span>
</span>
<td class="text-center">
<button class="edituser btn btn-flat" id="row{{ i }}" title="{{ 'General_Edit'|translate }}">
<span class="icon-edit"></span>
</button>
</td>
<td>
<span class="deleteuser link_but" id="row{{ i }}">
<img title="{{ 'General_Delete'|translate }}" src='plugins/Zeitgeist/images/ico_delete.png'/>
<span>{{ 'General_Delete'|translate }}</span>
</span>
<td class="text-center">
<button class="deleteuser btn btn-flat" id="row{{ i }}" title="{{ 'General_Delete'|translate }}">
<span class="icon-delete"></span>
</button>
</td>
</tr>
{% endif %}
{% endfor %}
</tbody>
</table>
<div class="addrow"><img src='plugins/UsersManager/images/add.png'/> {{ 'UsersManager_AddUser'|translate }}</div>
<p>
<button class="add-user btn btn-lg btn-flat">
<span class="icon-add"></span>
{{ 'UsersManager_AddUser'|translate }}
</button>
</p>
</div>
<h2 id="super_user_access">{{ 'UsersManager_SuperUserAccessManagement'|translate }}</h2>
@ -208,3 +239,5 @@
{% endif %}
{% endblock %}
{% endblock %}

View file

@ -0,0 +1,9 @@
{% extends '@UsersManager/index.twig' %}
{% block websiteAccessTable %}
<div class="notification system notification-error">
{{ message }}
</div>
{% endblock %}

View file

@ -1,181 +1,134 @@
{% extends 'admin.twig' %}
{% extends 'user.twig' %}
{% set title %}{{ 'UsersManager_PersonalSettings'|translate }}{% endset %}
{% block content %}
<h2 piwik-enriched-headline>{{ 'UsersManager_MenuUserSettings'|translate }}</h2>
<br/>
<h2 piwik-enriched-headline>{{ title }}</h2>
<div class="ui-confirm" id="confirmPasswordChange">
<h2>{{ 'UsersManager_ChangePasswordConfirm'|translate }}</h2>
<input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
<input role="no" type="button" value="{{ 'General_No'|translate }}"/>
</div>
<table id='userSettingsTable' class="adminTable">
<tr>
<td><label for="username">{{ 'General_Username'|translate }} </label></td>
<td>
<input size="25" value="{{ userLogin }}" id="username" disabled="disabled"/>
<span class='form-description'>{{ 'UsersManager_YourUsernameCannotBeChanged'|translate }}</span>
</td>
</tr>
<form id="userSettingsTable">
<tr>
<td><label for="alias">{{ 'UsersManager_Alias'|translate }} </label></td>
<td><input size="25" value="{{ userAlias }}" id="alias" /></td>
</tr>
<tr>
<td><label for="email">{{ 'UsersManager_Email'|translate }} </label></td>
<td><input size="25" value="{{ userEmail }}" id="email"/></td>
</tr>
<tr>
<td><div style="margin-top: 5px;margin-bottom: 10px;">{{ 'General_Language'|translate }}</div></td>
<td>
<fieldset style="margin-top: 5px;margin-bottom: 10px;">
<select name="language" id="language" onchange="if (this.value=='') window.open('?module=Proxy&amp;action=redirect&amp;url=http://piwik.org/translations/');">
<option title="" value="">{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</option>
{% for language in languages %}
<option value="{{ language.code }}" {% if language.code == currentLanguageCode %}selected="selected"{% endif %}
title="{{ language.name }} ({{ language.english_name }})">{{ language.name }}</option>
{% endfor %}
</select>
<br />
</fieldset>
</td>
</tr>
<tr>
<td>{{ 'UsersManager_ReportToLoadByDefault'|translate }}</td>
<td>
<fieldset>
<input id="defaultReportRadioAll" type="radio" value="MultiSites"
name="defaultReport"{% if defaultReport=='MultiSites' %} checked="checked"{% endif %} />
<label for="defaultReportRadioAll">{{ 'General_AllWebsitesDashboard'|translate }}</label><br/>
<input id="defaultReportSpecific" type="radio" value="1"
name="defaultReport"{% if defaultReport != 'MultiSites' %} checked="checked"{% endif %} />
<label for="defaultReportSpecific" style="padding-right:12px;">{{ 'General_DashboardForASpecificWebsite'|translate }}</label>
{% if defaultReport=='MultiSites' %}
{% set defaultReportIdSite=1 %}
{% else %}
{% set defaultReportIdSite=defaultReport %}
{% endif %}
<div class="form-group">
<label for="username">{{ 'General_Username'|translate }}</label>
<div class="form-help">{{ 'UsersManager_YourUsernameCannotBeChanged'|translate }}</div>
<input value="{{ userLogin }}" id="username" disabled="disabled"/>
</div>
<div piwik-siteselector
class="sites_autocomplete"
siteid="{{ defaultReportIdSite }}"
sitename="{{ defaultReportSiteName }}"
switch-site-on-select="false"
show-all-sites-item="false"
showselectedsite="true"
id="defaultReportSiteSelector"></div>
</fieldset>
</td>
</tr>
<tr>
<td>{{ 'UsersManager_ReportDateToLoadByDefault'|translate }}</td>
<td>
<fieldset>
{% for value,description in availableDefaultDates %}
<input id="defaultDate-{{ loop.index }}" type="radio"{% if defaultDate==value %} checked="checked"{% endif %} value="{{ value }}" name="defaultDate"/>
<label for="defaultDate-{{ loop.index }}">{{ description }}</label>
<br/>
{% endfor %}
</fieldset>
</td>
</tr>
<div class="form-group">
<label for="alias">{{ 'UsersManager_Alias'|translate }}</label>
<input value="{{ userAlias }}" id="alias" />
</div>
<div class="form-group">
<label for="email">{{ 'UsersManager_Email'|translate }}</label>
<input value="{{ userEmail }}" id="email"/>
</div>
<div class="form-group">
<label for="language">{{ 'General_Language'|translate }}</label>
<div class="form-help">
<a href="?module=Proxy&amp;action=redirect&amp;url=http://piwik.org/translations/" target="_blank">
{{ 'LanguagesManager_AboutPiwikTranslations'|translate }}</a>
</div>
<select name="language" id="language">
{% for language in languages %}
<option value="{{ language.code }}" {% if language.code == currentLanguageCode %}selected="selected"{% endif %}
title="{{ language.name }} ({{ language.english_name }})">{{ language.name }}</option>
{% endfor %}
</select>
</div>
<div class="form-group">
<label for="timeformat">{{ 'General_TimeFormat'|translate }}</label>
<select name="timeformat" id="timeformat">
<option value="1" {% if currentTimeformat == 1 %}selected="selected"{% endif %} title="{{ 'General_12HourClock'|translate }}">{{ 'General_12HourClock'|translate }}</option>
<option value="0" {% if currentTimeformat == 0 %}selected="selected"{% endif %} title="{{ 'General_24HourClock'|translate }}">{{ 'General_24HourClock'|translate }}</option>
</select>
</div>
<div class="form-group">
<label>{{ 'UsersManager_ReportToLoadByDefault'|translate }}</label>
<label class="radio">
<input id="defaultReportRadioAll" type="radio" value="MultiSites"
name="defaultReport"{% if defaultReport=='MultiSites' %} checked="checked"{% endif %} />
{{ 'General_AllWebsitesDashboard'|translate }}
</label>
<label class="radio">
<input id="defaultReportSpecific" type="radio" value="1"
name="defaultReport"{% if defaultReport != 'MultiSites' %} checked="checked"{% endif %} />
{{ 'General_DashboardForASpecificWebsite'|translate }}
</label>
<div piwik-siteselector
show-selected-site="true"
class="sites_autocomplete"
siteid="{{ defaultReportIdSite }}"
sitename="{{ defaultReportSiteName }}"
switch-site-on-select="false"
show-all-sites-item="false"
showselectedsite="true"
id="defaultReportSiteSelector"
></div>
</div>
<div class="form-group">
<label>{{ 'UsersManager_ReportDateToLoadByDefault'|translate }}</label>
{% for value,description in availableDefaultDates %}
<label class="radio">
<input id="defaultDate-{{ loop.index }}" type="radio"{% if defaultDate==value %} checked="checked"{% endif %} value="{{ value }}" name="defaultDate"/>
{{ description }}
</label>
{% endfor %}
</div>
{% if isValidHost is defined and isValidHost %}
<tr>
<td><label for="email">{{ 'General_ChangePassword'|translate }} </label></td>
<td><input size="25" value="" autocomplete="off" id="password" type="password"/>
<span class='form-description'>{{ 'UsersManager_IfYouWouldLikeToChangeThePasswordTypeANewOne'|translate }}</span>
<br/><br/><input size="25" value="" autocomplete="off" id="passwordBis" type="password"/>
<span class='form-description'> {{ 'UsersManager_TypeYourPasswordAgain'|translate }}</span>
</td>
</tr>
<div class="form-group">
<label for="password">{{ 'General_ChangePassword'|translate }}</label>
<div class="form-help">
{{ 'UsersManager_IfYouWouldLikeToChangeThePasswordTypeANewOne'|translate }}
</div>
<input value="" autocomplete="off" id="password" type="password"/>
</div>
<div class="form-group">
<div class="form-help">
{{ 'UsersManager_TypeYourPasswordAgain'|translate }}
</div>
<input value="" autocomplete="off" id="passwordBis" type="password"/>
</div>
{% endif %}
</table>
{% if isValidHost is not defined or not isValidHost %}
<div id="injectedHostCannotChangePwd">
{% set injectedHostCannotChangePwd %}
{{ 'UsersManager_InjectedHostCannotChangePwd'|translate(invalidHost) }}
&nbsp;{% if not isSuperUser %}{{ 'UsersManager_EmailYourAdministrator'|translate(invalidHostMailLinkStart,'</a>')|raw }}{% endif %}
{% endset %}
{{ injectedHostCannotChangePwd|notification({'raw': true, 'context': 'error', 'placeat': '#injectedHostCannotChangePwd', 'noclear': true}) }}
</div>
<br/>
{% endif %}
{% import 'ajaxMacros.twig' as ajax %}
{{ ajax.errorDiv('ajaxErrorUserSettings') }}
{{ ajax.loadingDiv('ajaxLoadingUserSettings') }}
<input type="submit" value="{{ 'General_Save'|translate }}" id="userSettingsSubmit" class="submit"/>
{% if isValidHost is not defined or not isValidHost %}
<div class="alert alert-danger">
{{ 'UsersManager_InjectedHostCannotChangePwd'|translate(invalidHost) }}
{% if not isSuperUser %}{{ 'UsersManager_EmailYourAdministrator'|translate(invalidHostMailLinkStart,'</a>')|raw }}{% endif %}
</div>
{% endif %}
<br/><br/>
{% import 'ajaxMacros.twig' as ajax %}
{{ ajax.errorDiv('ajaxErrorUserSettings') }}
{{ ajax.loadingDiv('ajaxLoadingUserSettings') }}
<button type="button" id="userSettingsSubmit">{{ 'General_Save'|translate }}</button>
</form>
<h2 id="excludeCookie">{{ 'UsersManager_ExcludeVisitsViaCookie'|translate }}</h2>
<p>
{% if ignoreCookieSet %}
{{ 'UsersManager_YourVisitsAreIgnoredOnDomain'|translate("<strong>", piwikHost, "</strong>")|raw }}
{% else %}
{{ 'UsersManager_YourVisitsAreNotIgnored'|translate("<strong>","</strong>")|raw }}
{% endif %}
{% if ignoreCookieSet %}
{{ 'UsersManager_YourVisitsAreIgnoredOnDomain'|translate("<strong>", piwikHost, "</strong>")|raw }}
{% else %}
{{ 'UsersManager_YourVisitsAreNotIgnored'|translate("<strong>","</strong>")|raw }}
{% endif %}
</p>
<span style="margin-left:20px;">
<a href='{{ linkTo({'token_auth':token_auth, 'action':'setIgnoreCookie'}) }}#excludeCookie'>&rsaquo; {% if ignoreCookieSet %}{{ 'UsersManager_ClickHereToDeleteTheCookie'|translate }}
<a href='{{ linkTo({'ignoreSalt':ignoreSalt, 'action':'setIgnoreCookie'}) }}#excludeCookie'>&rsaquo; {% if ignoreCookieSet %}{{ 'UsersManager_ClickHereToDeleteTheCookie'|translate }}
{% else %}{{'UsersManager_ClickHereToSetTheCookieOnDomain'|translate(piwikHost) }}{% endif %}
<br/>
</a></span>
<br/><br/>
{% if isSuperUser %}
<h2>{{ 'UsersManager_MenuAnonymousUserSettings'|translate }}</h2>
{% if anonymousSites|length == 0 %}
<h3 class='form-description'><strong>{{ 'UsersManager_NoteNoAnonymousUserAccessSettingsWontBeUsed2'|translate }}</strong></h3>
<br/>
{% else %}
<br/>
{{ ajax.errorDiv('ajaxErrorAnonymousUserSettings') }}
{{ ajax.loadingDiv('ajaxLoadingAnonymousUserSettings') }}
<table id='anonymousUserSettingsTable' class="adminTable" style='width:850px;'>
<tr>
<td style="width:400px;">{{ 'UsersManager_WhenUsersAreNotLoggedInAndVisitPiwikTheyShouldAccess'|translate }}</td>
<td>
<fieldset>
<input id="anonymousDefaultReport-login" type="radio" value="Login"
name="anonymousDefaultReport"{% if anonymousDefaultReport==loginModule %} checked="checked"{% endif %} />
<label for="anonymousDefaultReport-login">{{ 'UsersManager_TheLoginScreen'|translate }}</label><br/>
<input id="anonymousDefaultReport-multisites" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="MultiSites"
name="anonymousDefaultReport"{% if anonymousDefaultReport=='MultiSites' %} checked="checked"{% endif %} />
<label for="anonymousDefaultReport-multisites">{{ 'General_AllWebsitesDashboard'|translate }}</label><br/>
<input id="anonymousDefaultReport-specific" {% if anonymousSites is empty %}disabled="disabled" {% endif %}type="radio" value="1"
name="anonymousDefaultReport"{% if anonymousDefaultReport>0 %} checked="checked"{% endif %} />
<label for="anonymousDefaultReport-specific">{{ 'General_DashboardForASpecificWebsite'|translate }}</label>
{% if anonymousSites is not empty %}
<select id="anonymousDefaultReportWebsite">
{% for info in anonymousSites %}
<option value="{{ info.idsite }}" {% if anonymousDefaultReport==info.idsite %} selected="selected"{% endif %}>{{ info.name|raw }}</option>
{% endfor %}
</select>
{% endif %}
</fieldset>
</td>
</tr>
<tr>
<td>{{ 'UsersManager_ForAnonymousUsersReportDateToLoadByDefault'|translate }}</td>
<td>
<fieldset>
{% for value,description in availableDefaultDates %}
<input id="anonymousDefaultDate-{{ loop.index }}" type="radio" {% if anonymousDefaultDate==value %}checked="checked" {% endif %}value="{{ value }}"
name="anonymousDefaultDate"/>
<label for="anonymousDefaultDate-{{ loop.index }}">{{ description }}</label>
<br/>
{% endfor %}
</fieldset>
</td>
</tr>
</table>
<input type="submit" value="{{ 'General_Save'|translate }}" id="anonymousUserSettingsSubmit" class="submit"/>
{% endif %}
{% endif %}
{% endblock %}
{% endblock %}