Ticket #554: patch#554.txt

File patch#554.txt, 2.5 KB (added by sophie, 2 years ago)
Line 
1### Eclipse Workspace Patch 1.0
2#P stat
3Index: plugins/MultiSites/images/js.gif
4===================================================================
5Cannot display: file marked as a binary type.
6svn:mime-type = application/octet-stream
7
8Property changes on: plugins/MultiSites/images/js.gif
9___________________________________________________________________
10Added: svn:mime-type
11   + application/octet-stream
12
13Index: plugins/MultiSites/templates/row.tpl
14===================================================================
15--- plugins/MultiSites/templates/row.tpl        (revision 108)
16+++ plugins/MultiSites/templates/row.tpl        (working copy)
17@@ -2,7 +2,10 @@
18     <a title="View reports" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%">%name%</a>
19     
20     <span style="width: 10px; margin-left:3px">
21-       <a target="_blank" title="Go to %main_url%" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"></a>
22+       <a target="_blank" title="Go to %main_url%" href="%main_url%"><img src="plugins/MultiSites/images/link.gif" style="margin-right: 0;"></a>
23+    </span>
24+    <span style="width: 10px; margin-left:3px">
25+       <a title="Show tracking tag" href="index.php?module=SitesManager&action=displayJavascriptCode&idSite=%idsite%"><img src="plugins/MultiSites/images/js.gif"></a>
26     </span>
27 </td>
28 <td class="multisites-column">
29Index: plugins/SitesManager/Controller.php
30===================================================================
31--- plugins/SitesManager/Controller.php (revision 108)
32+++ plugins/SitesManager/Controller.php (working copy)
33@@ -37,7 +37,7 @@
34                $jsTag = Piwik::getJavascriptCode($idSite, Piwik_Url::getCurrentUrlWithoutFileName());
35                $view = Piwik_View::factory('DisplayJavascriptCode');
36                $this->setGeneralVariablesView($view);
37-               $view->menu = Piwik_GetAdminMenu();
38+               $view->menu = Piwik::isUserHasAdminAccess($idSite) ? Piwik_GetAdminMenu() : '';
39                $site = new Piwik_Site($idSite);
40                $view->displaySiteName = $site->getName();
41                $view->jsTag = $jsTag;
42Index: plugins/SitesManager/templates/DisplayJavascriptCode.tpl
43===================================================================
44--- plugins/SitesManager/templates/DisplayJavascriptCode.tpl    (revision 108)
45+++ plugins/SitesManager/templates/DisplayJavascriptCode.tpl    (working copy)
46@@ -2,7 +2,9 @@
47 {assign var=showPeriodSelection value=false}
48 {include file="CoreAdminHome/templates/header.tpl"}
49 {loadJavascriptTranslations plugins='SitesManager'}
50+{if $menu}
51 {include file="CoreAdminHome/templates/menu.tpl"}
52+{/if}
53 
54 {literal}
55 <style>