Adjusted content.tmpl.php in other themes (atutor 1.5, blumin, greenmin, mobile)...

diff --git a/docs/themes/blumin/content.tmpl.php b/docs/themes/blumin/content.tmpl.php
index d4d457a..bfdd074 100644 (file)
--- a/docs/themes/blumin/content.tmpl.php
+++ b/docs/themes/blumin/content.tmpl.php
@@ -10,16 +10,20 @@
 /* modify it under the terms of the GNU General Public License          */\r
 /* as published by the Free Software Foundation.                        */\r
 /************************************************************************/\r
-if (!defined('AT_INCLUDE_PATH')) { exit; } ?>\r
+if (!defined('AT_INCLUDE_PATH')) { exit; } \r
 \r
-<?php\r
 // print the AccessForAll alternatives tool bar\r
-// see /content.php for details of the alt_parts() array\r
+// see /content.php for details of the alt_infos() array\r
 // images for the toolbar can be customized by adding images of the same name to a theme's images directory\r
-echo '<div id="alternatives_shortcuts">';\r
-print_alternative_tools($this->cid,$this->theme_image_path,$this->alt_parts,$this->has_sign_lang_alternative,$this->has_visual_alternative,$this->has_audio_alternative,$this->has_text_alternative);\r
-echo '</div>';\r
 ?>\r
+<div id="alternatives_shortcuts">\r
+<?php \r
+       foreach ($this->alt_infos as $alt_info){\r
+               echo '<a href="'.$_SERVER['PHP_SELF'].'?cid='.$cid.(($_GET['alternative'] == $alt_info['0']) ? '' : htmlentities_utf8(SEP).'alternative='.$alt_info[0]).'">\r
+                       <img src="'.AT_BASE_HREF.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[3] : $alt_info[4]).'" alt="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" title="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" border="0" class="img1616"/></a>';\r
+       } \r
+?>\r
+</div>\r
 \r
 <?php if ($this->shortcuts): ?>\r
 <fieldset id="shortcuts"><legend><?php echo _AT('shortcuts'); ?></legend>\r

diff --git a/docs/themes/default/content.tmpl.php b/docs/themes/default/content.tmpl.php
index 3c08cb4..cfb4d9f 100644 (file)
--- a/docs/themes/default/content.tmpl.php
+++ b/docs/themes/default/content.tmpl.php
@@ -13,7 +13,7 @@
 if (!defined('AT_INCLUDE_PATH')) { exit; } \r
 \r
 // print the AccessForAll alternatives tool bar\r
-// see /content.php for details of the alt_parts() array\r
+// see /content.php for details of the alt_infos() array\r
 // images for the toolbar can be customized by adding images of the same name to a theme's images directory\r
 ?>\r
 <div id="alternatives_shortcuts">\r

diff --git a/docs/themes/default15/content.tmpl.php b/docs/themes/default15/content.tmpl.php
index 931ffd2..e4605c5 100644 (file)
--- a/docs/themes/default15/content.tmpl.php
+++ b/docs/themes/default15/content.tmpl.php
@@ -10,15 +10,21 @@
 /* modify it under the terms of the GNU General Public License          */\r
 /* as published by the Free Software Foundation.                        */\r
 /************************************************************************/\r
-if (!defined('AT_INCLUDE_PATH')) { exit; } ?>\r
-<?php\r
+if (!defined('AT_INCLUDE_PATH')) { exit; } \r
+\r
 // print the AccessForAll alternatives tool bar\r
-// see /content.php for details of the alt_parts() array\r
+// see /content.php for details of the alt_infos() array\r
 // images for the toolbar can be customized by adding images of the same name to a theme's images directory\r
-echo '<div id="alternatives_shortcuts">';\r
-print_alternative_tools($this->cid,$this->theme_image_path,$this->alt_parts,$this->has_sign_lang_alternative,$this->has_visual_alternative,$this->has_audio_alternative,$this->has_text_alternative);\r
-echo '</div>';\r
 ?>\r
+<div id="alternatives_shortcuts">\r
+<?php \r
+       foreach ($this->alt_infos as $alt_info){\r
+               echo '<a href="'.$_SERVER['PHP_SELF'].'?cid='.$cid.(($_GET['alternative'] == $alt_info['0']) ? '' : htmlentities_utf8(SEP).'alternative='.$alt_info[0]).'">\r
+                       <img src="'.AT_BASE_HREF.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[3] : $alt_info[4]).'" alt="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" title="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" border="0" class="img1616"/></a>';\r
+       } \r
+?>\r
+</div>\r
+ \r
 <?php if ($this->shortcuts): ?>\r
 <fieldset id="shortcuts"><legend><?php echo _AT('shortcuts'); ?></legend>\r
        <ul>\r

diff --git a/docs/themes/greenmin/content.tmpl.php b/docs/themes/greenmin/content.tmpl.php
index c9aa1ec..0b100ef 100644 (file)
--- a/docs/themes/greenmin/content.tmpl.php
+++ b/docs/themes/greenmin/content.tmpl.php
@@ -10,15 +10,21 @@
 /* modify it under the terms of the GNU General Public License          */\r
 /* as published by the Free Software Foundation.                        */\r
 /************************************************************************/\r
-if (!defined('AT_INCLUDE_PATH')) { exit; } ?>\r
-<?php\r
+if (!defined('AT_INCLUDE_PATH')) { exit; } \r
+\r
 // print the AccessForAll alternatives tool bar\r
-// see /content.php for details of the alt_parts() array\r
+// see /content.php for details of the alt_infos() array\r
 // images for the toolbar can be customized by adding images of the same name to a theme's images directory\r
-echo '<div id="alternatives_shortcuts">';\r
-print_alternative_tools($this->cid,$this->theme_image_path,$this->alt_parts,$this->has_sign_lang_alternative,$this->has_visual_alternative,$this->has_audio_alternative,$this->has_text_alternative);\r
-echo '</div>';\r
 ?>\r
+<div id="alternatives_shortcuts">\r
+<?php \r
+       foreach ($this->alt_infos as $alt_info){\r
+               echo '<a href="'.$_SERVER['PHP_SELF'].'?cid='.$cid.(($_GET['alternative'] == $alt_info['0']) ? '' : htmlentities_utf8(SEP).'alternative='.$alt_info[0]).'">\r
+                       <img src="'.AT_BASE_HREF.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[3] : $alt_info[4]).'" alt="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" title="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" border="0" class="img1616"/></a>';\r
+       } \r
+?>\r
+</div>\r
+ \r
 <?php if ($this->shortcuts): ?>\r
 <fieldset id="shortcuts"><legend><?php echo _AT('shortcuts'); ?></legend>\r
        <ul>\r

diff --git a/docs/themes/mobile/content.tmpl.php b/docs/themes/mobile/content.tmpl.php
index 9610124..b4cd843 100644 (file)
--- a/docs/themes/mobile/content.tmpl.php
+++ b/docs/themes/mobile/content.tmpl.php
@@ -10,44 +10,20 @@
 /* modify it under the terms of the GNU General Public License  */\r
 /* as published by the Free Software Foundation.                               */\r
 /****************************************************************/\r
-if (!defined('AT_INCLUDE_PATH')) { exit; } ?>\r
+if (!defined('AT_INCLUDE_PATH')) { exit; } \r
 \r
-<?php if ($this->has_text_alternative || $this->has_audio_alternative || $this->has_visual_alternative || $this->has_sign_lang_alternative): ?>\r
+// print the AccessForAll alternatives tool bar\r
+// see /content.php for details of the alt_infos() array\r
+// images for the toolbar can be customized by adding images of the same name to a theme's images directory\r
+?>\r
 <div id="alternatives_shortcuts">\r
-<?php if ($this->has_text_alternative) :?>\r
-  <a href="<?php echo $_SERVER['PHP_SELF'].'?cid='.$this->cid.(($_GET['alternative'] == 3) ? '' : htmlentities_utf8(SEP).'alternative=3'); ?>">\r
-    <img src="<?php echo AT_BASE_HREF; ?>images/<?php echo (($_GET['alternative'] == 3) ? 'pause.png' : 'text_alternative.png'); ?>" \r
-      alt="<?php echo (($_GET['alternative'] == 3) ? _AT('stop_apply_text_alternatives') : _AT('apply_text_alternatives')); ?>" \r
-      title="<?php echo (($_GET['alternative'] == 3) ? _AT('stop_apply_text_alternatives') : _AT('apply_text_alternatives')); ?>" \r
-      border="0" />\r
-  </a>\r
-<?php endif; // END OF has text alternative?>\r
-<?php if ($this->has_audio_alternative) :?>\r
-  <a href="<?php echo $_SERVER['PHP_SELF'].'?cid='.$this->cid.(($_GET['alternative'] == 1) ? '' : htmlentities_utf8(SEP).'alternative=1'); ?>">\r
-    <img src="<?php echo AT_BASE_HREF; ?>images/<?php echo (($_GET['alternative'] == 1) ? 'pause.png' : 'audio_alternative.png'); ?>" \r
-      alt="<?php echo (($_GET['alternative'] == 1) ? _AT('stop_apply_audio_alternatives') : _AT('apply_audio_alternatives')); ?>" \r
-      title="<?php echo (($_GET['alternative'] == 1) ? _AT('stop_apply_audio_alternatives') : _AT('apply_audio_alternatives')); ?>" \r
-      border="0" />\r
-  </a>\r
-<?php endif; // END OF has audio alternative?>\r
-<?php if ($this->has_visual_alternative) :?>\r
-  <a href="<?php echo $_SERVER['PHP_SELF'].'?cid='.$this->cid.(($_GET['alternative'] == 4) ? '' : htmlentities_utf8(SEP).'alternative=4'); ?>">\r
-    <img src="<?php echo AT_BASE_HREF; ?>images/<?php echo (($_GET['alternative'] == 4) ? 'pause.png' : 'visual_alternative.png'); ?>" \r
-      alt="<?php echo (($_GET['alternative'] == 4) ? _AT('stop_apply_visual_alternatives') : _AT('apply_visual_alternatives')); ?>" \r
-      title="<?php echo (($_GET['alternative'] == 4) ? _AT('stop_apply_visual_alternatives') : _AT('apply_visual_alternatives')); ?>" \r
-      border="0" />\r
-  </a>\r
-<?php endif; // END OF has visual alternative?>\r
-<?php if ($this->has_sign_lang_alternative) :?>\r
-  <a href="<?php echo $_SERVER['PHP_SELF'].'?cid='.$this->cid.(($_GET['alternative'] == 2) ? '' : htmlentities_utf8(SEP).'alternative=2'); ?>">\r
-    <img src="<?php echo AT_BASE_HREF; ?>images/<?php echo (($_GET['alternative'] == 2) ? 'pause.png' : 'sign_lang_alternative.png'); ?>" \r
-      alt="<?php echo (($_GET['alternative'] == 2) ? _AT('stop_apply_sign_lang_alternatives') : _AT('apply_sign_lang_alternatives')); ?>" \r
-      title="<?php echo (($_GET['alternative'] == 2) ? _AT('stop_apply_sign_lang_alternatives') : _AT('apply_sign_lang_alternatives')); ?>" \r
-      border="0" />\r
-  </a>\r
-<?php endif; // END OF has sign language alternative?>\r
+<?php \r
+       foreach ($this->alt_infos as $alt_info){\r
+               echo '<a href="'.$_SERVER['PHP_SELF'].'?cid='.$cid.(($_GET['alternative'] == $alt_info['0']) ? '' : htmlentities_utf8(SEP).'alternative='.$alt_info[0]).'">\r
+                       <img src="'.AT_BASE_HREF.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[3] : $alt_info[4]).'" alt="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" title="'.(($_GET['alternative'] == $alt_info[0]) ? $alt_info[2] : $alt_info[1]).'" border="0" class="img1616"/></a>';\r
+       } \r
+?>\r
 </div>\r
-<?php endif; // END OF displaying alternative shortcut icons?>\r
 \r
 <?php \r
 if ($_SESSION["prefs"]["PREF_SHOW_CONTENTS"] && $this->content_table <> "") \r