Permalink
Browse files

Site selector need siteName as parameter so it properly displays the …

…selected site name.

refs #2
  • Loading branch information...
1 parent 8ef4507 commit ad9d3b20c501d379ceed054c65afa86914bb82fa @halfdan committed Mar 18, 2013
Showing with 4 additions and 4 deletions.
  1. +2 −2 Controller.php
  2. +2 −2 templates/index.tpl
View
@@ -14,11 +14,11 @@ function index()
$idSite = Piwik_Common::getRequestVar('idSite', false, 'int');
$idSitesAvailable = Piwik_SitesManager_API::getInstance()->getSitesWithAdminAccess();
-
$view->feeds = Piwik_FeedAnnotation_API::getInstance()->getFeeds(array($idSite));
$view->idSiteSelected = $idSite;
$view->idSitesAvailable = $idSitesAvailable;
+ $view->siteName = Piwik_Site::getNameFor($idSite);
$view->menu = Piwik_GetAdminMenu();
echo $view->render();
}
-}
+}
View
@@ -9,8 +9,8 @@
<span style="line-height: 30px">{'FeedAnnotation_Website'|translate}:</span>
{include file="CoreHome/templates/sites_selection.tpl"
idSite=$idSiteSelected sites=$idSitesAvailable showAllSitesItem=false
- showSelectedSite=false siteSelectorId="feedAnnotationSiteSelect"
- switchSiteOnSelect=true}
+ showSelectedSite=true siteSelectorId="feedAnnotationSiteSelect"
+ switchSiteOnSelect=true siteName=$siteName}
</section>
<div class="entityContainer">

0 comments on commit ad9d3b2

Please sign in to comment.