(accessibility/misc-core-fixes/issues/3) Add accessible labels

civicrm · Apr 5, 2018 · 80a3926 · 80a3926
1 parent 3aa5f41
commit 80a3926
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 512 deletions.
diff --git a/CRM/Core/Controller.php b/CRM/Core/Controller.php
@@ -736,7 +736,7 @@ public function getTemplateFile() {
     }
     else {
       $config = CRM_Core_Config::singleton();
-      return 'CRM/common/' . strtolower($config->userFramework) . '.tpl';
+      return 'CRM/common/CMSPrint.tpl';
     }
   }
 

diff --git a/CRM/Core/Page.php b/CRM/Core/Page.php
@@ -221,7 +221,7 @@ public function run() {
       CRM_Core_Resources::singleton()->addScriptFile('civicrm', 'js/crm.livePage.js', 1, 'html-header');
     }
 
-    $content = self::$_template->fetch('CRM/common/' . strtolower($config->userFramework) . '.tpl');
+    $content = self::$_template->fetch('CRM/common/CMSPrint.tpl');
 
     // Render page header
     if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {

diff --git a/CRM/Core/Selector/Controller.php b/CRM/Core/Selector/Controller.php
@@ -494,7 +494,7 @@ public function moveFromSessionToTemplate() {
     }
     else {
       $config = CRM_Core_Config::singleton();
-      $content = self::$_template->fetch('CRM/common/' . strtolower($config->userFramework) . '.tpl');
+      $content = self::$_template->fetch('CRM/common/CMSPrint.tpl');
     }
     echo CRM_Utils_System::theme($content, $this->_print);
   }

diff --git a/CRM/Utils/REST.php b/CRM/Utils/REST.php
@@ -410,7 +410,7 @@ public static function loadTemplate() {
 
       $smarty->assign('tplFile', $tpl);
       $config = CRM_Core_Config::singleton();
-      $content = $smarty->fetch('CRM/common/' . strtolower($config->userFramework) . '.tpl');
+      $content = $smarty->fetch('CRM/common/CMSPrint.tpl');
 
       if (!defined('CIVICRM_UF_HEAD') && $region = CRM_Core_Region::instance('html-header', FALSE)) {
         CRM_Utils_System::addHTMLHead($region->render(''));

diff --git a/templates/CRM/common/wordpress.tpl → templates/CRM/common/CMSPrint.tpl b/templates/CRM/common/wordpress.tpl → templates/CRM/common/CMSPrint.tpl
@@ -29,17 +29,34 @@
 
 <div id="crm-container" class="crm-container{if $urlIsPublic} crm-public{/if}" lang="{$config->lcMessages|truncate:2:"":true}" xml:lang="{$config->lcMessages|truncate:2:"":true}">
 
+{if $config->userFramework|lower eq 'joomla'}
+<div id="crm-nav-menu-container"></div>
 {crmNavigationMenu is_default=1}
 
-{if $breadcrumb}
-    <div class="breadcrumb">
-      {foreach from=$breadcrumb item=crumb key=key}
-        {if $key != 0}
-           &raquo;
-        {/if}
-      {$crumb}
-      {/foreach}
-    </div>
+<table border="0" cellpadding="0" cellspacing="0" id="crm-content">
+  <tr>
+    {if $sidebarLeft}
+      <td id="sidebar-left" valign="top">
+        <div id="civi-sidebar-logo" style="margin: 0 0 .25em .25em">
+          <img src="{$config->resourceBase}i/logo_words_small.png" title="{ts}CiviCRM{/ts}"/>
+        </div>
+        <div class="spacer"></div>
+        {$sidebarLeft}
+      </td>
+    {/if}
+    <td id="content-right" valign="top">
+      {if $breadcrumb}
+        <div class="breadcrumb">
+          {foreach from=$breadcrumb item=crumb key=key}
+            {if $key != 0}
+              &raquo;
+            {/if}
+            <a href="{$crumb.url}">{$crumb.title}</a>
+          {/foreach}
+        </div>
+      {/if}
+{else}
+  {crmNavigationMenu is_default=1}
 {/if}
 
 {if isset($browserPrint) and $browserPrint}
@@ -66,14 +83,11 @@
 
 {crmRegion name='page-header'}
 {/crmRegion}
-{*{include file="CRM/common/langSwitch.tpl"}*}
-
 <div class="clear"></div>
 
 {if isset($localTasks) and $localTasks}
     {include file="CRM/common/localNav.tpl"}
 {/if}
-
 <div id="crm-main-content-wrapper">
   {include file="CRM/common/status.tpl"}
   {crmRegion name='page-body'}
@@ -85,7 +99,6 @@
   {/crmRegion}
 </div>
 
-
 {crmRegion name='page-footer'}
 {if $urlIsPublic}
   {include file="CRM/common/publicFooter.tpl"}
@@ -94,4 +107,10 @@
 {/if}
 {/crmRegion}
 
+{if $config->userFramework|lower eq 'joomla'}
+    </td>
+  </tr>
+</table>
+{/if}
+
 </div> {* end crm-container div *}
diff --git a/templates/CRM/common/backdrop.tpl b/templates/CRM/common/backdrop.tpl
diff --git a/templates/CRM/common/drupal.tpl b/templates/CRM/common/drupal.tpl
diff --git a/templates/CRM/common/drupal6.tpl b/templates/CRM/common/drupal6.tpl
-Original file line number
+Diff line change
@@ Expand Up / @@ -736,7 +736,7 @@ public function getTemplateFile() { @@
         }
         else {
           $config = CRM_Core_Config::singleton();
-          return 'CRM/common/' . strtolower($config->userFramework) . '.tpl';
+          return 'CRM/common/CMSPrint.tpl';
         }
       }
@@ Expand Down @@