fix(ux): external links

agilare · May 14, 2023 · 8ee3982 · 8ee3982
1 parent b9cee7e
commit 8ee3982
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [3.4.6] Unreleased
 
+### Added
+
+- events : api sending night "fêtes" events of a day (Noctambus)
+
 ### Changed
 
 - [ ] events form
@@ -26,11 +30,12 @@
 - users - password reset : in db table rm unique of idPersonne to avoid crash
 - users - edit : affiliation text wasn't saved, display "avec affiliation" field only if pertinent
 - add ini_set session.gc_probability to enable auto clean of old session in Debian
+- UX : added missing icon ext links
 - [ ] in small screens events lists right overflow
 
 ### Added
 
-- [ ] Doc link in menu 1 for admin users
+- Doc link in menu 1 for admin users
 - tests : added assertions, for most important cases in Selenium suites
 
 ### Changed

diff --git a/admin/_menuAdmin.inc.php b/admin/_menuAdmin.inc.php
@@ -32,5 +32,10 @@
 		</li>
         <?php } ?>
     </ul>
+    <ul style="list-style-type:none">
+        <li>
+            <a href="https://tools.ladecadanse.ch/doc/Administration/index.html" class="url lien_ext" target="_blank">Documentation</a>
+        </li>
+    </ul>
 </div>
 <!-- Fin gestion -->
diff --git a/evenement.php b/evenement.php
@@ -347,10 +347,8 @@ function initMap() {
                         }
 						if (!empty($listeLieu['URL']))
 						{?>
-						<li><a class="url" href="<?php
-
-
-						if (!preg_match("/^https?:\/\//", $listeLieu['URL']))
+                            <li><a class="url lien_ext" href="<?php
+                                       if (!preg_match("/^https?:\/\//", $listeLieu['URL']))
 						{
 							echo 'http://'.$listeLieu['URL'];
 						}
@@ -363,8 +361,8 @@ function initMap() {
 						}
 						?>
                         <?php if ($even->getValue('idLieu') == 13) { // exception pour le Rez ?>
-                            <a href="http://kalvingrad.com" target="_blank">kalvingrad.com</a><br>
-                            <a href="http://www.ptrnet.ch" target="_blank">ptrnet.ch</a>
+                        <a href="http://kalvingrad.com" class="url lien_ext" target="_blank">kalvingrad.com</a><br>
+                            <a href="http://www.ptrnet.ch" class="url lien_ext" target="_blank">ptrnet.ch</a>
                         <?php } ?>
 					</ul>
 				</div>

diff --git a/lieu.php b/lieu.php
@@ -414,8 +414,13 @@ function initMap() {
                    <span class="value-title" title="<?php echo $lieu->getValue('lng'); ?>"></span>
                 </span>
 				<li><?php echo Text::wikiToHtml($lieu->getValue('horaire_general')); ?></li>
-				<li class="sitelieu"><a class="url" href="<?php echo $URL; ?>" title="Voir le site web du lieu" onclick="window.open(this.href,'_blank');return false;"><?php echo $lieu->getValue('URL'); ?></a> <?php if ($lieu->getId() == 13) { // exception pour le Rez ?><a href="http://kalvingrad.com" onclick="window.open(this.href,'_blank');return false;">kalvingrad.com</a><br><a href="http://www.ptrnet.ch" onclick="window.open(this.href,'_blank');return false;">ptrnet.ch</a><?php } ?></li>
-				<?php echo $organisateurs; ?>
+                <li class="sitelieu">
+                    <?php if (!empty($URL)) { ?>
+                        <a class="url lien_ext" href="<?php echo $URL; ?>" title="Voir le site web du lieu"  target="_blank"><?php echo $lieu->getValue('URL'); ?></a>
+                    <?php } ?>
+                    <?php if ($lieu->getId() == 13) { // exception pour le Rez   ?><a href="http://kalvingrad.com" class="url lien_ext"  target="_blank">kalvingrad.com</a><br><a href="http://www.ptrnet.ch" class="url lien_ext" target="_blank">ptrnet.ch</a><?php } ?>
+                </li>
+                <?php echo $organisateurs; ?>
             </ul>
             <div id="plan" style="display:none"><div id="map"></div></div>
         </div><!-- Fin pratique -->

diff --git a/organisateur.php b/organisateur.php
@@ -192,10 +192,13 @@
 
 		<!-- Deb pratique -->
 		<div id="pratique">
-			<ul>
-				<li class="siteLieu"><a class="url" href="<?php echo $URL; ?>" onclick="window.open(this.href,'_blank');return false;">
-				<?php echo $organisateur->getValue('URL'); ?></a></li>
-				<?php echo $lieux; ?>
+            <ul>
+                <?php if (!empty($URL)) { ?>
+                    <li class="siteLieu"><a href="<?php echo $URL; ?>" class="url lien_ext" target="_blank">
+                                <?php echo $organisateur->getValue('URL'); ?></a>
+                        </li>
+                <?php } ?>
+                <?php echo $lieux; ?>
 				<?php echo $membres; ?>
 			</ul>
 
@@ -473,7 +476,7 @@
     if (!preg_match("/^(https?:\/\/)/i", $organisateur->getValue('URL'))) {
 		$URLcomplete = "http://" . $organisateur->getValue('URL');
     }
-	echo "<p>Pour des informations complémentaires : <a href=\"" . $URLcomplete . "\" title=\"Aller sur le site web\" onclick=\"window.open(this.href,'_blank');return false;\">" . $organisateur->getValue('URL') . "</a></p>\n";
+	echo "<p>Pour des informations complémentaires : <a href=\"" . $URLcomplete . "\" class=\"lien_ext\" target=\"_blank\">" . $organisateur->getValue('URL') . "</a></p>\n";
 }
 
 echo '</div>';