viewgit/inc/functions.php:22 Function utf8_encode() is deprecated [8192]

web page tweaks to make activities up to mix crawls validate, a=chris

Chris Pollett [2019-11-22 23:Nov:nd]
web page tweaks to make activities up to mix crawls validate, a=chris
Filename
src/css/search.css
src/views/elements/AdminElement.php
src/views/elements/HelpElement.php
src/views/elements/ManageadvertisementsElement.php
src/views/elements/ManagerolesElement.php
src/views/elements/ManageusersElement.php
src/views/elements/MixcrawlsElement.php
src/views/elements/SearchoptionsElement.php
src/views/layouts/WebLayout.php
diff --git a/src/css/search.css b/src/css/search.css
index 43b80e13f..8586b833f 100755
--- a/src/css/search.css
+++ b/src/css/search.css
@@ -560,8 +560,9 @@ body.mobile
 {
     border: 0;
     margin: 0;
-    min-width:12.5in;
-    max-width:13in;
+    min-width:9.5in; /* making width values larger will
+                affect help visibility */
+    max-width:11in;
     padding: 0;
 }
 .mobile .body-container
diff --git a/src/views/elements/AdminElement.php b/src/views/elements/AdminElement.php
index 23afded1b..d1cebbece 100644
--- a/src/views/elements/AdminElement.php
+++ b/src/views/elements/AdminElement.php
@@ -80,6 +80,7 @@ class AdminElement extends Element implements CrawlConstants
             setTimeout("logoutWarn()", autologout - minute);
             setTimeout("autoLogout()", autologout);
             </script><?php
-        }
+        } ?>
+        </div><?php
     }
 }
diff --git a/src/views/elements/HelpElement.php b/src/views/elements/HelpElement.php
index e7c260748..803c0894e 100644
--- a/src/views/elements/HelpElement.php
+++ b/src/views/elements/HelpElement.php
@@ -60,7 +60,7 @@ class HelpElement extends Element
                         </a>]
                     </div>
                     <div id="help-frame-head">
-                        <h2 id="page_name" class="help-title"></h2>
+                        <h2 id="page_name" class="help-title"><span></span></h2>
                     </div>
                     <div id="help-frame-body" class="wordwrap">
                     </div>
diff --git a/src/views/elements/ManageadvertisementsElement.php b/src/views/elements/ManageadvertisementsElement.php
index 0b75ff48e..7be85486f 100644
--- a/src/views/elements/ManageadvertisementsElement.php
+++ b/src/views/elements/ManageadvertisementsElement.php
@@ -406,10 +406,9 @@ class ManageadvertisementsElement extends Element
             ?></textarea>
             </td>
             </tr>
-            <tr>
             <?php
             if (isset($data['AD_MIN_BID'])) {
-                ?><th class="table-label"><label for="ad-min-bid"><?=
+                ?><tr><th class="table-label"><label for="ad-min-bid"><?=
                     tl('manageadvertisements_element_keyword_bid_amount')
                     ?>:</label></th><td>
                     <input type="text" id='ad-min-bid' name="AD_MIN_BID"
@@ -518,7 +517,7 @@ class ManageadvertisementsElement extends Element
             <div class="ad-preview">
                 <p><b><?=tl('manageadvertisements_element_preview')
                 ?>:</b></p>
-                <p class='start-ad'><img src="<?= C\AD_LOGO ?>" />
+                <p class='start-ad'><img alt="" src="<?= C\AD_LOGO ?>" />
                     <a id="ad-name-preview" href="./" class="ad-preview-anchor"
                         target="_blank" rel="noopener">
                     </a>
diff --git a/src/views/elements/ManagerolesElement.php b/src/views/elements/ManagerolesElement.php
index d2a153db1..691d437af 100644
--- a/src/views/elements/ManagerolesElement.php
+++ b/src/views/elements/ManagerolesElement.php
@@ -85,7 +85,7 @@ class ManagerolesElement extends Element
             <tr>
                 <th><?= tl('manageroles_element_rolename')?></th>
                 <th colspan='2'><?= tl('manageroles_element_actions') ?></th>
-            </tr><tr></tr><?php
+            </tr><?php
             $admin_url = htmlentities(B\controllerUrl('admin', true));
             $base_url = $admin_url . C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN].
                 "&amp;a=manageRoles";
@@ -119,7 +119,7 @@ class ManagerolesElement extends Element
                 if ($data['CURRENT_ROLE']['name'] != $role['NAME']) {
                     ?>
                     <td><a href="<?php e($edit_url . 'name='.
-                        $role['NAME']); ?>"><?=
+                        urlencode($role['NAME'])); ?>"><?=
                     tl('manageroles_element_edit') ?></a></td><?php
                 } else { ?>
                     <td class='admin-edit-row-field'>
@@ -154,7 +154,6 @@ class ManagerolesElement extends Element
         <?php if ($_SERVER["MOBILE"]) { ?>
             <div class="clear">&nbsp;</div>
         <?php } ?>
-        </div>
         </div><?php
     }
     /**
diff --git a/src/views/elements/ManageusersElement.php b/src/views/elements/ManageusersElement.php
index a83f57e0d..81c54e753 100644
--- a/src/views/elements/ManageusersElement.php
+++ b/src/views/elements/ManageusersElement.php
@@ -103,7 +103,7 @@ class ManageusersElement extends Element
                 } ?>
                 <th><?= tl('manageusers_element_status') ?></th>
                 <th colspan='2'><?= tl('manageusers_element_actions') ?></th>
-            </tr><tr></tr>
+            </tr>
         <?php
             $base_url = htmlentities(B\controllerUrl('admin', true)) .
                 C\CSRF_TOKEN."=".$data[C\CSRF_TOKEN]. "&amp;a=manageUsers";
diff --git a/src/views/elements/MixcrawlsElement.php b/src/views/elements/MixcrawlsElement.php
index 643d15efb..e36b3bb37 100644
--- a/src/views/elements/MixcrawlsElement.php
+++ b/src/views/elements/MixcrawlsElement.php
@@ -75,7 +75,7 @@ class MixcrawlsElement extends Element
             !empty($data['context']) && $data['context'] == 'search') {
             $context = 'context=search&';
         }
-        $num_columns = $_SERVER["MOBILE"] ? 5 : 6;
+        $num_columns = $_SERVER["MOBILE"] ? 4 : 5;
         if (in_array($data['FORM_TYPE'], ['search'])) {
             $data['DISABLE_ADD_TOGGLE'] = true;
         }
@@ -98,7 +98,7 @@ class MixcrawlsElement extends Element
             <th><?= tl('mixcrawls_view_definition') ?></th><?php
         }
         ?>
-        <th colspan="4"><?= tl('mixcrawls_view_actions') ?></th></tr><tr></tr>
+        <th colspan="3"><?= tl('mixcrawls_view_actions') ?></th></tr>
         <?php
         foreach ($data['available_mixes'] as $mix) { ?>
             <tr><td><b><?= $mix['NAME'] ?></b><br />
@@ -158,7 +158,6 @@ class MixcrawlsElement extends Element
         }
         ?>
         </table>
-        </div>
         </div><?php
     }
     /**
diff --git a/src/views/elements/SearchoptionsElement.php b/src/views/elements/SearchoptionsElement.php
index 59b7627d1..712785696 100644
--- a/src/views/elements/SearchoptionsElement.php
+++ b/src/views/elements/SearchoptionsElement.php
@@ -133,7 +133,7 @@ class SearchoptionsElement extends Element
                 ?>
                 <li><?=$bold_open ?><a href="<?=$option_url ?>"><?=
                     $search['SUBSEARCH_NAME'] ?></a><?=$bold_close
-                    ?></a></li><?php
+                    ?></li><?php
             } ?>
         </ul><?php
         }?>
diff --git a/src/views/layouts/WebLayout.php b/src/views/layouts/WebLayout.php
index eaddce444..a001fee43 100755
--- a/src/views/layouts/WebLayout.php
+++ b/src/views/layouts/WebLayout.php
@@ -220,9 +220,8 @@ class WebLayout extends Layout
         $this->view->renderView($data);
         if (C\QUERY_STATISTICS && (!isset($this->presentation) ||
             !$this->presentation)) { ?>
-        <div class="query-statistics">
-        <?php
-            e("<h1>".tl('web_layout_query_statistics')."</h1>");
+            <div class="query-statistics"><?php
+            e("<h1>" . tl('web_layout_query_statistics')."</h1>");
             e("<div><b>".
                 $data['YIOOP_INSTANCE']
                 ."</b><br /><br />");
@@ -235,8 +234,7 @@ class WebLayout extends Layout
                         $query_info['ELAPSED_TIME']).
                         "</b></div></div>");
             } ?>
-        </div>
-        <?php
+            </div><?php
         }
         $script_path = C\APP_DIR . "/scripts/basic.js";
         $pre_path = C\BASE_URL;
@@ -246,7 +244,7 @@ class WebLayout extends Layout
         ?>
         <script src="<?=$pre_path ?>scripts/basic.js" ></script>
         <?php
-        if ($this->view->helper('helpbutton')->is_help_initialized){
+        if ($this->view->helper('helpbutton')->is_help_initialized) {
             if (!isset($data["INCLUDE_SCRIPTS"])) {
                 $data["INCLUDE_SCRIPTS"] = [];
             }
ViewGit