diff --git a/VERSIONS_WIP/32530 b/VERSIONS_WIP/32530 new file mode 100644 index 0000000000000000000000000000000000000000..6e6c6f66272dd0024925f208f9b697febdb13808 --- /dev/null +++ b/VERSIONS_WIP/32530 @@ -0,0 +1 @@ + - ticket #32530 : Accueil administration : afficher une boîte pour accédeer à la salle de discussion #bokeh diff --git a/application/modules/admin/views/scripts/index/index.phtml b/application/modules/admin/views/scripts/index/index.phtml index 50aed3678a94a28103e4c16c635fd8004d3c8e1b..01122c45bb53cccb964175aee2e9c6fce2ec8ca6 100644 --- a/application/modules/admin/views/scripts/index/index.phtml +++ b/application/modules/admin/views/scripts/index/index.phtml @@ -66,11 +66,16 @@ foreach ($modstats as $stat) { <?php echo $this->ligneInfos('Par courriel (de préférence)', '<a href="mailto:hotline@afi-sa.fr">hotline@afi-sa.fr</a>') ?> <?php echo $this->ligneInfos('Par téléphone', '01.60.17.12.34 en semaine, 01.60.37.01.34 le samedi') ?> -<h2>Participez à la communauté !</h2> +<h2><?php echo $this->_('Participez à la communauté'); ?> !</h2> <div class='ligne_info'><a onclick="window.open(this.href); return false" href="https://groups.google.com/group/utilisateurs-bokeh">Google group Bokeh</a></div> <div class='ligne_info'><a onclick="window.open(this.href); return false" href="http://wiki.bokeh-library-portal.org">Wiki Bokeh</a></div> - <h2>Forum Bokeh :</h2> + <h2><?php echo $this->_('Salle de discussion #Bokeh'); ?> :</h2> + <?php echo $this->ligneInfos($this->_('Discutez avec les contributeurs de Bokeh en direct'), '<a href="http://wiki.bokeh-library-portal.org/index.php/Salle_de_discussion_bokeh" target="_blank"><img src="'.BASE_URL.'/public/admin/images/ico/help.png"></img></a>') ?> +<br> + <iframe src="https://kiwiirc.com/client/irc.freenode.net/?nick=votrenom-?#bokeh" style="border:0; width:100%; height:450px;"></iframe> + + <h2><?php echo $this->_('Forum Bokeh'); ?> :</h2> <iframe id="forum_embed" src="javascript:void(0)" scrolling="no" @@ -85,7 +90,6 @@ foreach ($modstats as $stat) { "&showsearch=true&hl=fr&hideforumtitle=true&showpopout=true"; </script> - <script> (function() { function supportsCanvas() { diff --git a/tests/application/modules/admin/controllers/IndexControllerTest.php b/tests/application/modules/admin/controllers/IndexControllerTest.php index 41c78b0d873d73087d5ac05cffb1a8e9643808e6..c1bb1bb49729335ba207cf1be14d5f2706a20d11 100644 --- a/tests/application/modules/admin/controllers/IndexControllerTest.php +++ b/tests/application/modules/admin/controllers/IndexControllerTest.php @@ -51,6 +51,11 @@ class IndexControllerIndexTest extends Admin_AbstractControllerTestCase { $this->assertXPathContentContains('//div/b', 'http://bokeh-library-portal.org'); } + /** @test */ + public function channelAccessShouldPresent() { + $this->assertXPathContentContains('//div[@class="modules"]/h2', 'Salle de discussion #Bokeh :'); + } + /** @test */ public function editDomaineNameLinkShouldBePresent() { @@ -107,4 +112,4 @@ class IndexControllerClearCacheActionTest extends Admin_AbstractControllerTestCa public function clearCacheShouldRedirectToAdminVar() { $this->assertRedirectTo('/admin/index/adminvar'); } -} \ No newline at end of file +}