diff options
| author | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-04-02 01:08:24 +0400 |
|---|---|---|
| committer | matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> | 2010-04-02 01:08:24 +0400 |
| commit | 48edef07bdc252fd9f0e9c90d8f0434fbe71e7ba (patch) | |
| tree | ce4e80ffe4671eda6213184f871e4fde7f612003 /plugins/SitesManager | |
| parent | 55cee28655de774b437a9b31eab52b5c2ed062c3 (diff) | |
* Added General settings page to: enable browser archiving, define today's archive time to live (fixes #1149)
* added User settings page, that all logged in users can access to edit: Alias, email, default report to load, default date. Implemented settings in the _option table (rather than adding new fields to the table). Fixes #401 refs #526
* the super user can edit settings for the anonymous user and force the anonymous to the login screen or a specific website
* added order feature in admin menu + colored current menu + hiding menu entries that are not visible to the logged in user anyway
* improved styles of admin forms
Diffstat (limited to 'plugins/SitesManager')
| -rw-r--r-- | plugins/SitesManager/SitesManager.php | 5 | ||||
| -rw-r--r-- | plugins/SitesManager/templates/SitesManager.tpl | 15 |
2 files changed, 7 insertions, 13 deletions
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php index c9b6751183..ebd2838131 100644 --- a/plugins/SitesManager/SitesManager.php +++ b/plugins/SitesManager/SitesManager.php @@ -39,7 +39,10 @@ class Piwik_SitesManager extends Piwik_Plugin function addMenu() { - Piwik_AddAdminMenu('SitesManager_MenuSites', array('module' => 'SitesManager', 'action' => 'index')); + Piwik_AddAdminMenu('SitesManager_MenuSites', + array('module' => 'SitesManager', 'action' => 'index'), + Piwik::isUserHasSomeAdminAccess(), + $order = 5); } function css() diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl index 81e942a0b8..858f634a1d 100644 --- a/plugins/SitesManager/templates/SitesManager.tpl +++ b/plugins/SitesManager/templates/SitesManager.tpl @@ -67,15 +67,6 @@ option, select { textarea { font-size:9pt; } -.globalSettings td { -vertical-align:top; -} -.globalSettings .ui-inline-help { - margin-top:0; - margin-bottom:30px; - width:100%; - margin-left:40px; -} .admin thead th { vertical-align:middle; } @@ -102,7 +93,7 @@ vertical-align:middle; <th>{'SitesManager_Name'|translate}</th> <th>{'SitesManager_Urls'|translate}</th> <th>{'SitesManager_ExcludedIps'|translate}</th> - <th>{'SitesManager_ExcludedParameters'|replace:" ":"<br/>"}</th> + <th>{'SitesManager_ExcludedParameters'|translate|replace:" ":"<br/>"}</th> <th>{'SitesManager_Timezone'|translate}</th> <th>{'SitesManager_Currency'|translate}</th> <th> </th> @@ -139,7 +130,7 @@ vertical-align:middle; <br/> {ajaxErrorDiv id=ajaxErrorGlobalSettings} {ajaxLoadingDiv id=ajaxLoadingGlobalSettings} - <table width='600px' class='globalSettings'> + <table style='width:600px' class="adminTable adminTableNoBorder" > <tr><td colspan="2"> <b>{'SitesManager_GlobalListExcludedIps'|translate}</b> @@ -183,7 +174,7 @@ vertical-align:middle; {$currencyHelpPlain} </td></tr> </table> - <p><input type="submit" class="submit" id='globalSettingsSubmit' value="{'General_Save'|translate}" /></p> + <span style='margin-left:20px'><input type="submit" class="submit" id='globalSettingsSubmit' value="{'General_Save'|translate}" /></span> {/if} <br /><br /><br /><br /> |