From 64728c655330d99faf3093ed127a2b23de2d3b09 Mon Sep 17 00:00:00 2001
From: gabordikan <gabordikan@gmail.com>
Date: Fri, 2 Aug 2024 16:28:32 +0200
Subject: [PATCH] login screen changes: resolve conflict

---
 protected/views/base/_brand.php | 14 --------------
 protected/views/site/login.php  | 16 ----------------
 2 files changed, 30 deletions(-)

diff --git a/protected/views/base/_brand.php b/protected/views/base/_brand.php
index 82bf3f22cd..e57cea9e51 100644
--- a/protected/views/base/_brand.php
+++ b/protected/views/base/_brand.php
@@ -51,7 +51,6 @@
 
   <div class="group">
     <h4>Support</h4>
-<<<<<<< fix/loginscreen_changes
 	<?php if(Yii::app()->params['enable_default_support_text']){ ?>
         <p>Paid for support and maintenance is available from our Accredited Professional Services Partner network.<br>A list of available partners can be found at the following link <a href="http://openeyes.apperta.org" target="_blank">openeyes.apperta.org</a></p>
 	<?php } else { ?>
@@ -65,19 +64,6 @@
 	    <?php endif; ?>
 	</p>
         <?php } ?>
-=======
-    <p>
-    <span class="large-text"> Need Help?&nbsp;
-        <?php  $purifier = new CHtmlPurifier(); ?>
-        <?php if (Yii::app()->params['helpdesk_phone'] || Yii::app()->params['helpdesk_email']) : ?>
-            <?= Yii::app()->params['helpdesk_phone'] ? $purifier->purify(Yii::app()->params['helpdesk_phone']) : null ?>
-            <?= Yii::app()->params['helpdesk_email'] ? $purifier->purify(Yii::app()->params['helpdesk_email']) : null ?>
-            <?= Yii::app()->params['helpdesk_hours'] ? "<br/>(" . $purifier->purify(Yii::app()->params['helpdesk_hours']) . ")" : null ?>
-        <?php elseif ($tech_support_provider) : ?>
-          <a href="<?= $tech_support_url ?>" target="_blank"><?= $tech_support_provider ?></a>
-        <?php endif; ?>
-    </p>
->>>>>>> release/v4.0.3
   </div>
   <div class="group">
     <h4>Version: <?= Yii::App()->params['oe_version'] ?></h4>
diff --git a/protected/views/site/login.php b/protected/views/site/login.php
index c0aee3cc8b..c29dc16124 100644
--- a/protected/views/site/login.php
+++ b/protected/views/site/login.php
@@ -43,7 +43,6 @@
       <!-- user -->
     </div>
     <div class="info">
-<<<<<<< fix/loginscreen_changes
       <center>
       <a href="http://apperta.org" target="_blank"><img src="<?php echo Yii::app()->assetManager->createUrl('img/logo/logo.png') ?>" alt="Apperta Foundation CIC Logo" width="30%" style="padding-right:20px"></a>
        <a href="https://digitalpublicgoods.net/who-we-are/" target="_blank"><img src="<?php echo Yii::app()->assetManager->createUrl('img/logo/dpga_logo_2.svg') ?>" alt="Digital Public Good Alliance Logo" width="30%" style="padding-right:20px">
@@ -52,21 +51,6 @@
     </center>
         <!--<a href="#" onclick="$('#js-openeyes-btn').click();">About</a>-->
       
-=======
-      <div class="flex-layout">
-        <span class="large-text"> Need Help?&nbsp;
-          <?php  $purifier = new CHtmlPurifier(); ?>
-          <?php if (Yii::app()->params['helpdesk_phone'] || Yii::app()->params['helpdesk_email']) : ?>
-                <?= Yii::app()->params['helpdesk_phone'] ? "<strong>" . $purifier->purify(Yii::app()->params['helpdesk_phone']) . "</strong>" : null ?></strong>
-                <?= Yii::app()->params['helpdesk_email'] ? "<br/>" . $purifier->purify(Yii::app()->params['helpdesk_email']) : null ?>
-                <?= Yii::app()->params['helpdesk_hours'] ? "<br/> (" . $purifier->purify(Yii::app()->params['helpdesk_hours']) . ")" : null ?>
-          <?php elseif ($tech_support_provider) : ?>
-            <strong><a href="<?= $tech_support_url ?>" target="_blank"><?= $tech_support_provider ?></a></strong>
-          <?php endif; ?>
-        </span>
-        <a href="#" onclick="$('#js-openeyes-btn').click();">About</a>
-      </div>
->>>>>>> release/v4.0.3
       <!-- info -->
     </div>
     <!-- login -->