Commit 8ea6e7cb authored by Ghislain Loas's avatar Ghislain Loas

Merge branch...

Merge branch 'dev#71408_mise_en_valeur_des_chiffres_assistance_liste_des_fonctionalites_moderations_chiffre_sur_rond_de_fond_rouge_cf_reseaux_sociaux' into 'master'

Dev#71408 mise en valeur des chiffres assistance liste des fonctionalites moderations chiffre sur rond de fond rouge cf reseaux sociaux

See merge request afi/opacce!2503
parents 60ddf5ec fdf5a5d0
- ticket #71408 : Administration : mise en valeur des compteurs des menus assistance et fonctionalités.
\ No newline at end of file
<?php
$skin = Class_Admin_Skin::current();
echo $this->tag('h2',
$skin->renderMenuIconOn('tag', $this)
. $this->tag('span', $this->_('Journée communautaire Bokeh 2018'))
. $this->Button((new Class_Entity())
->setText($this->_('Jeudi 15 mars'))
->setAttribs(['onclick' => 'window.open(\'http://bokeh-library-portal.org/journee_bokeh_2018\');'])),
['id' => 'learn_more']);
?>
<h2 style="display:inline;border:none">
<?php
echo $skin->renderMenuIconOn('tag', $this,
['style' => 'vertical-align:middle'])
. ' '
. $this->_('Journée communautaire Bokeh 2018');
$button = (new Class_Entity())->setText($this->_('Jeudi 15 mars'))
->setAttribs(['id' => 'learn_more',
'onclick' => 'window.open(\'http://bokeh-library-portal.org/journee_bokeh_2018\'); return false']);
echo $this->Button($button);
?>
</h2>
<h2 class="toggle_video">
<?php
<h2 class="toggle_video">
<?php
Class_ScriptLoader::getInstance()->addJQueryReady('$(".toggle_video").click(function() {$(this).toggleClass("on");$(this).next().toggle();})');
echo $this->_('Démonstrations vidéos');
?>
echo $this->_('Démonstrations vidéos');
?>
</h2>
<div><iframe width="750" height="450" src="https://www.youtube.com/embed/videoseries?list=PLL40cYmJt-b9YSCI0rvnxl8xjptuvgiZC" allowfullscreen></iframe></div>
<div><iframe width="750" height="450" src="https://www.youtube.com/embed/videoseries?list=PLL40cYmJt-b9YSCI0rvnxl8xjptuvgiZC" allowfullscreen></iframe></div>
<h2><?php echo $this->_('Paramètres du site');?>&nbsp;:</h2>
<h2><?php echo $this->_('Paramètres du site');?>&nbsp;:</h2>
<?php
$lien = $edit_domain_name = '';
if ($this->user->isAdmin()) {
......@@ -40,18 +34,18 @@ if ($this->user->isAdmin()) {
}
echo $this->ligneInfos($this->_('Etat du site'), $this->etat_site . $lien)
. $this->ligneInfos($this->_('Nom du domaine'), Class_AdminVar::getNomDomaine() . $edit_domain_name);
. $this->ligneInfos($this->_('Nom du domaine'), Class_AdminVar::getNomDomaine() . $edit_domain_name);
?>
<h2><?php echo $this->_('Données en attente de modération');?>&nbsp;:
<a class="rss" href="<?php
<a class="rss" href="<?php
echo $this->url(array('module' => 'opac',
'controller' => 'rss',
'action' => 'moderations'));
?>"><img src="<?php echo URL_ADMIN_IMG;?>/rss.gif" alt="RSS"/></a>
</h2>
</h2>
<?php
$moderer = new Class_Moderer();
$moderer = new Class_Moderer();
$modstats = $moderer->getModerationStats();
foreach ($modstats as $stat) {
$nombre = ($stat['count']) ? $stat['count'] : 'aucun';
......@@ -66,25 +60,25 @@ foreach ($modstats as $stat) {
<h2><?php echo $this->_('Participez à la communauté'); ?> !</h2>
<div class='ligne_info'>
<a onclick="window.open(this.href); return false" href="http://bokeh-library-portal.org"><?php echo $this->_('Site communautaire');?></a> -
<a onclick="window.open(this.href); return false" href="https://groups.google.com/group/utilisateurs-bokeh"><?php echo $this->_('Google group Bokeh');?></a> -
<a onclick="window.open(this.href); return false" href="http://wiki.bokeh-library-portal.org"><?php echo $this->_('Wiki Bokeh');?></a> -
<a onclick="window.open(this.href); return false" href="http://git.afi-sa.fr/afi/opacce/tree/master"><?php echo $this->_('Code source');?></a>
<a onclick="window.open(this.href); return false" href="https://groups.google.com/group/utilisateurs-bokeh"><?php echo $this->_('Google group Bokeh');?></a> -
<a onclick="window.open(this.href); return false" href="http://wiki.bokeh-library-portal.org"><?php echo $this->_('Wiki Bokeh');?></a> -
<a onclick="window.open(this.href); return false" href="http://git.afi-sa.fr/afi/opacce/tree/master"><?php echo $this->_('Code source');?></a>
</div>
<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" alt=""/></a>') ?>
'<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" alt=""/></a>') ?>
<br>
<iframe src="https://kiwiirc.com/client/irc.freenode.net/?nick=votrenom-?#bokeh" style="border:0; width:100%; height:450px;"></iframe>
<script>
(function() {
function supportsCanvas() {
return !!document.createElement('canvas').getContext;
}
<script>
(function() {
function supportsCanvas() {
return !!document.createElement('canvas').getContext;
}
if (!supportsCanvas())
showNotification({message: 'Votre navigateur ne permet pas d\'utiliser pleinement l\'interface d\'administration. Pour un fonctionnement optimal, nous recommandons d\'utiliser une version récente de Firefox, Chrome, Safari ou Internet Explorer',
type: 'error'});
})();
if (!supportsCanvas())
showNotification({message: 'Votre navigateur ne permet pas d\'utiliser pleinement l\'interface d\'administration. Pour un fonctionnement optimal, nous recommandons d\'utiliser une version récente de Firefox, Chrome, Safari ou Internet Explorer',
type: 'error'});
})();
</script>
......@@ -90,8 +90,9 @@ class ZendAfi_View_Helper_Admin_Nav extends ZendAfi_View_Helper_BaseHelper {
$this->getImgUrl($entry['icon'], $entry['label']) .
$entry['label'] .
$this->getCountInfo($entry),
['title' => $entry['label'],
'class' => $this->getSelectedClass($entry['url'])]));
array_filter(['title' => $entry['label'],
'data-count' => isset($entry['count']) ? $entry['count'] : null,
'class' => $this->getSelectedClass($entry['url'])])));
return $lis;
}
......
......@@ -273,6 +273,7 @@ li {
.barre_nav li a {
line-height: 3em;
vertical-align: middle;
display: inline-block;
}
.barre_nav li a img {
......@@ -281,8 +282,22 @@ li {
height: 24px;
}
.barre_nav li a[href*="/admin/redmine"] img {
filter: invert(1);
}
.barre_nav li a[data-count] .menu_info {
font-weight: bold;
border-radius: 30px;
padding: 0.2ex 0.35em;
}
.barre_nav li a[data-count] .menu_info {
background-color: var(--error-background);
}
.barre_nav li .menu_info {
padding-left:.5em;
margin-left:.5em;
}
.main > .left {
......@@ -1006,13 +1021,19 @@ table#logs img {
overflow: auto;
}
#learn_more {
#learn_more > * {
vertical-align: middle;
margin-right: 0.2em;
}
#learn_more button {
background-color:var(--bokeh-event);
padding:10px;
padding: 0.5ex 2em;
text-transform:uppercase;
}
#learn_more:hover {
#learn_more button:focus,
#learn_more button:hover {
background-color:var(--bokeh-event-highlight);
}
......@@ -29,6 +29,12 @@ class FeatureControllerIndexDispatchTest extends Admin_AbstractControllerTestCas
}
/** @test */
public function barNavShouldContainsFeaturesLinkWithCounter() {
$this->assertXPathContentContains('//ul//li//a[@data-count]', 'Fonctionnalités');
}
/** @test */
public function fileManagerShouldBeANewFeature() {
$this->assertXPathContentContains('//table[@id="features"]//td', 'Explorateur de fichier');
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment